November 2010 - openSUSE Commits - openSUSE Mailing Lists

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

02 Nov '10

Hello community, here is the log from the commit of package lzo for openSUSE:Factory checked in at Tue Nov 2 13:17:57 CET 2010. -------- --- lzo/lzo.changes 2010-02-11 12:30:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/lzo/lzo.changes 2010-10-30 21:10:01.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Oct 30 19:05:43 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Use GCC visibility. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lzo.spec ++++++ --- /var/tmp/diff_new_pack.gLsoJM/_old 2010-11-02 13:17:24.000000000 +0100 +++ /var/tmp/diff_new_pack.gLsoJM/_new 2010-11-02 13:17:24.000000000 +0100 @@ -21,7 +21,7 @@ Name: lzo Url: http://www.oberhumer.com/opensource/lzo/ Version: 2.03 -Release: 6 +Release: 12 Group: Development/Libraries/C and C++ Source: lzo-%{version}.tar.bz2 Source2: baselibs.conf @@ -106,7 +106,17 @@ %patch1 %build +export CFLAGS="%optflags -fvisibility=hidden" %configure --enable-shared --disable-static --libdir=/%{_lib} + +#On windows, the build system defines __LZO_EXPORT1 to +# __attribute__((dllexport))) which we can abuse to make +#use of GCC visibility. ;-) +#see http://gcc.gnu.org/wiki/Visibility +#If you remove this, you must disable -fvisibility=hidden in CFLAGS! + +echo '#define __LZO_EXPORT1 __attribute__ ((visibility ("default")))' >> config.h + %{__make} %{?_smp_mflags} %check ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libcares2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package libcares2 for openSUSE:Factory checked in at Tue Nov 2 13:17:09 CET 2010. -------- --- libcares2/libcares2.changes 2010-07-25 21:04:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/libcares2/libcares2.changes 2010-10-29 18:52:35.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 16:51:25 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Fix aliasing warning in gcc +- Add missing break that caused get_ares_servers to fail + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0002-Fix-aliasing-warning-in-gcc-4.4.4-at-least.patch 0003-Add-missing-break-that-caused-get_ares_servers-to-fa.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcares2.spec ++++++ --- /var/tmp/diff_new_pack.8mYvQR/_old 2010-11-02 13:16:29.000000000 +0100 +++ /var/tmp/diff_new_pack.8mYvQR/_new 2010-11-02 13:16:29.000000000 +0100 @@ -22,7 +22,7 @@ Name: libcares2 Version: 1.7.3 -Release: 1 +Release: 2 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ @@ -30,7 +30,9 @@ Source: http://daniel.haxx.se/projects/c-ares/%{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRequires: pkg-config -Patch: 0001-fix-memory-leak-in-ares_getnameinfo.patch +Patch0: 0001-fix-memory-leak-in-ares_getnameinfo.patch +Patch1: 0002-Fix-aliasing-warning-in-gcc-4.4.4-at-least.patch +Patch2: 0003-Add-missing-break-that-caused-get_ares_servers-to-fa.patch %description c-ares is a C library that performs DNS requests and name resolves @@ -50,7 +52,9 @@ %prep %setup -q -n %{pkg_name}-%{version} -%patch -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure --enable-symbol-hiding --enable-nonblocking --enable-shared --disable-static --with-pic ++++++ 0001-fix-memory-leak-in-ares_getnameinfo.patch ++++++ --- /var/tmp/diff_new_pack.8mYvQR/_old 2010-11-02 13:16:29.000000000 +0100 +++ /var/tmp/diff_new_pack.8mYvQR/_new 2010-11-02 13:16:29.000000000 +0100 @@ -1,8 +1,13 @@ -From c93018913b91bf7c4699ff5badff5dcc91e8145f Mon Sep 17 00:00:00 2001 +From 40230cf46163d4ea01e6541b60076fb494245d90 Mon Sep 17 00:00:00 2001 From: Andrew C. Morrow <andrew.c.morrow(a)gmail.com> Date: Wed, 16 Jun 2010 10:18:24 +0800 -Subject: [PATCH] fix memory leak in ares_getnameinfo +Subject: [PATCH 1/3] fix memory leak in ares_getnameinfo +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Cristian Rodríguez <cristian.rodriguez(a)opensuse.org> --- ares_getnameinfo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) @@ -28,5 +33,5 @@ } niquery->callback(niquery->arg, status, niquery->timeouts, NULL, NULL); -- -1.6.0.2 +1.7.3.1 ++++++ 0002-Fix-aliasing-warning-in-gcc-4.4.4-at-least.patch ++++++ >From 7b8ec4c1aeb4f2237b85107b2746d8b0a4be055b Mon Sep 17 00:00:00 2001 From: Ben Greear <greearb(a)candelatech.com> Date: Sat, 31 Jul 2010 07:10:23 -0700 Subject: [PATCH 2/3] Fix aliasing warning in gcc 4.4.4 (at least). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should be no functional change, though the code gets a bit ugglier. Signed-off-by: Ben Greear <greearb(a)candelatech.com> Signed-off-by: Cristian Rodríguez <cristian.rodriguez(a)opensuse.org> --- ares_process.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ares_process.c b/ares_process.c index 3ef1ddb..fbe857a 100644 --- a/ares_process.c +++ b/ares_process.c @@ -435,11 +435,15 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, unsigned char buf[PACKETSZ + 1]; #ifdef HAVE_RECVFROM ares_socklen_t fromlen; +#ifdef HAVE_STRUCT_SOCKADDR_STORAGE + struct sockaddr_storage from; +#else union { struct sockaddr_in sa4; struct sockaddr_in6 sa6; } from; #endif +#endif if(!read_fds && (read_fd == ARES_SOCKET_BAD)) /* no possible action */ @@ -474,10 +478,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, * packets as we can. */ do { #ifdef HAVE_RECVFROM - if (server->addr.family == AF_INET) - fromlen = sizeof(from.sa4); - else - fromlen = sizeof(from.sa6); + fromlen = sizeof(from); /* doesn't matter if it's larger than needed */ count = (ssize_t)recvfrom(server->udp_socket, (void *)buf, sizeof(buf), 0, (struct sockaddr *)&from, &fromlen); #else @@ -488,7 +489,15 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, else if (count <= 0) handle_error(channel, i, now); #ifdef HAVE_RECVFROM - else if (!same_address((struct sockaddr *)&from, &server->addr)) +#ifdef HAVE_STRUCT_SOCKADDR_STORAGE + /* This family hack works around compiler warnings about + * aliases. + */ + else if (!((from.ss_family == server->addr.family) && + same_address((struct sockaddr *)&from, &server->addr))) +#else + else if (!same_address((struct sockaddr *)&from, &server->addr))) +#endif /* The address the response comes from does not match * the address we sent the request to. Someone may be * attempting to perform a cache poisoning attack. */ @@ -1147,8 +1156,10 @@ static int same_address(struct sockaddr *sa, struct ares_addr *aa) void *addr1; void *addr2; +#ifndef HAVE_STRUCT_SOCKADDR_STORAGE if (sa->sa_family == aa->family) { +#endif switch (aa->family) { case AF_INET: @@ -1166,7 +1177,9 @@ static int same_address(struct sockaddr *sa, struct ares_addr *aa) default: break; } +#ifndef HAVE_STRUCT_SOCKADDR_STORAGE } +#endif return 0; /* different */ } -- 1.7.3.1 ++++++ 0003-Add-missing-break-that-caused-get_ares_servers-to-fa.patch ++++++ >From f04d0298e0885f9f0dacc93240c500e28c2c0a82 Mon Sep 17 00:00:00 2001 From: Ben Greear <greearb(a)candelatech.com> Date: Tue, 24 Aug 2010 16:48:47 -0700 Subject: [PATCH 3/3] Add missing break that caused get_ares_servers to fail. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Ning Dong <flintning(a)163.com> Signed-off-by: Ben Greear <greearb(a)candelatech.com> Signed-off-by: Cristian Rodríguez <cristian.rodriguez(a)opensuse.org> --- ares_data.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ares_data.c b/ares_data.c index 6b6fae8..a2477be 100644 --- a/ares_data.c +++ b/ares_data.c @@ -145,7 +145,8 @@ void *ares_malloc_data(ares_datatype type) ptr->data.addr_node.next = NULL; ptr->data.addr_node.family = 0; memset(&ptr->data.addr_node.addrV6, 0, - sizeof(ptr->data.addr_node.addrV6)); + sizeof(ptr->data.addr_node.addrV6)); + break; default: free(ptr); -- 1.7.3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-IO-Socket-SSL for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package perl-IO-Socket-SSL for openSUSE:Factory checked in at Tue Nov 2 13:13:58 CET 2010. -------- --- perl-IO-Socket-SSL/perl-IO-Socket-SSL.changes 2010-03-26 11:54:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-IO-Socket-SSL/perl-IO-Socket-SSL.changes 2010-11-01 13:59:14.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Nov 1 13:09:07 CET 2010 - anicka(a)suse.cz + +- update to 1.34 + * schema http for certificate verification changed to + wildcards_in_cn=1, because according to rfc2818 this is valid + and also seen in the wild + * if upgrading socket from inet to ssl fails due to handshake + problems the socket gets downgraded, but is still open. + * depreceate kill_socket, just use close() + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- IO-Socket-SSL-1.33.tar.bz2 New: ---- IO-Socket-SSL-1.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IO-Socket-SSL.spec ++++++ --- /var/tmp/diff_new_pack.iZicWp/_old 2010-11-02 13:12:12.000000000 +0100 +++ /var/tmp/diff_new_pack.iZicWp/_new 2010-11-02 13:12:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-IO-Socket-SSL (Version 1.33) +# spec file for package perl-IO-Socket-SSL (Version 1.34) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: perl-IO-Socket-SSL BuildRequires: perl-Net-SSLeay perl-libwww-perl -Version: 1.33 +Version: 1.34 Release: 1 Provides: p_iossl Obsoletes: p_iossl ++++++ IO-Socket-SSL-1.33.tar.bz2 -> IO-Socket-SSL-1.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.33/Changes new/IO-Socket-SSL-1.34/Changes --- old/IO-Socket-SSL-1.33/Changes 2010-03-17 13:48:59.000000000 +0100 +++ new/IO-Socket-SSL-1.34/Changes 2010-11-01 09:53:16.000000000 +0100 @@ -1,4 +1,12 @@ +v1.34 2010.11.01 +- schema http for certificate verification changed to + wildcards_in_cn=1, because according to rfc2818 this is valid and + also seen in the wild +- if upgrading socket from inet to ssl fails due to handshake problems + the socket gets downgraded, but is still open. + See https://rt.cpan.org/Ticket/Display.html?id=61466 +- depreceate kill_socket, just use close() v1.33 2010.03.17 - attempt to make t/memleak_bad_handshake.t more stable, it fails for unknown reason on various systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.33/MANIFEST new/IO-Socket-SSL-1.34/MANIFEST --- old/IO-Socket-SSL-1.33/MANIFEST 2010-03-17 13:51:54.000000000 +0100 +++ new/IO-Socket-SSL-1.34/MANIFEST 2010-11-01 09:54:35.000000000 +0100 @@ -34,6 +34,7 @@ t/dhe.t t/readline.t t/start-stopssl.t +t/startssl-failed.t t/acceptSSL-timeout.t t/connectSSL-timeout.t t/verify_hostname.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.33/META.yml new/IO-Socket-SSL-1.34/META.yml --- old/IO-Socket-SSL-1.33/META.yml 2010-03-17 13:51:54.000000000 +0100 +++ new/IO-Socket-SSL-1.34/META.yml 2010-11-01 09:54:35.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: IO-Socket-SSL -version: 1.33 +version: 1.34 abstract: Nearly transparent SSL encapsulation for IO::Socket::INET. author: - Steffen Ullrich & Peter Behroozi & Marko Asplund @@ -8,6 +8,8 @@ distribution_type: module configure_requires: ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 requires: Net::SSLeay: 1.21 Scalar::Util: 0 @@ -15,7 +17,7 @@ directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.48 +generated_by: ExtUtils::MakeMaker version 6.54 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.33/SSL.pm new/IO-Socket-SSL-1.34/SSL.pm --- old/IO-Socket-SSL-1.33/SSL.pm 2010-03-17 13:46:00.000000000 +0100 +++ new/IO-Socket-SSL-1.34/SSL.pm 2010-11-01 09:53:27.000000000 +0100 @@ -1,13 +1,13 @@ #!/usr/bin/perl -w # -# IO::Socket::SSL: +# IO::Socket::SSL: # a drop-in replacement for IO::Socket::INET that encapsulates # data passed over a network with SSL. # # Current Code Shepherd: Steffen Ullrich <steffen at genua.de> # Code Shepherd before: Peter Behroozi, <behrooz at fas.harvard.edu> # -# The original version of this module was written by +# The original version of this module was written by # Marko Asplund, <marko.asplund at kronodoc.fi>, who drew from # Crypt::SSLeay (Net::SSL) by Gisle Aas. # @@ -31,19 +31,19 @@ SSL_RECEIVED_SHUTDOWN => 2, }; - + # non-XS Versions of Scalar::Util will fail BEGIN{ eval { use Scalar::Util 'dualvar'; dualvar(0,'') }; - die "You need the XS Version of Scalar::Util for dualvar() support" + die "You need the XS Version of Scalar::Util for dualvar() support" if $@; } use vars qw(@ISA $VERSION $DEBUG $SSL_ERROR $GLOBAL_CONTEXT_ARGS @EXPORT ); { - # These constants will be used in $! at return from SSL_connect, + # These constants will be used in $! at return from SSL_connect, # SSL_accept, generic_read and write, thus notifying the caller # the usual way of problems. Like with EAGAIN, EINPROGRESS.. # these are especially important for non-blocking sockets @@ -53,10 +53,10 @@ my $y = Net::SSLeay::ERROR_WANT_WRITE(); use constant SSL_WANT_WRITE => dualvar( \$y, 'SSL wants a write first' ); - @EXPORT = qw( - SSL_WANT_READ SSL_WANT_WRITE SSL_VERIFY_NONE SSL_VERIFY_PEER + @EXPORT = qw( + SSL_WANT_READ SSL_WANT_WRITE SSL_VERIFY_NONE SSL_VERIFY_PEER SSL_VERIFY_FAIL_IF_NO_PEER_CERT SSL_VERIFY_CLIENT_ONCE - $SSL_ERROR GEN_DNS GEN_IPADD + $SSL_ERROR GEN_DNS GEN_IPADD ); } @@ -65,7 +65,7 @@ BEGIN { # Declare @ISA, $VERSION, $GLOBAL_CONTEXT_ARGS - + # if we have IO::Socket::INET6 we will use this not IO::Socket::INET, because # it can handle both IPv4 and IPv6. If we don't have INET6 available fall back # to INET @@ -78,7 +78,7 @@ }) { @ISA = qw(IO::Socket::INET); } - $VERSION = '1.33'; + $VERSION = '1.34'; $GLOBAL_CONTEXT_ARGS = {}; #Make $DEBUG another name for $Net::SSLeay::trace @@ -134,11 +134,11 @@ # Export some stuff # inet4|inet6|debug will be handeled by myself, everything # else will be handeld the Exporter way -sub import { +sub import { my $class = shift; my @export; - foreach (@_) { + foreach (@_) { if ( /^inet4$/i ) { # explicitly fall back to inet4 @ISA = 'IO::Socket::INET'; @@ -180,7 +180,7 @@ # work around Bug in IO::Socket::INET6 where it doesn't use the # right family for the socket on BSD systems: # http://rt.cpan.org/Ticket/Display.html?id=39550 - if ( $can_ipv6 && ! $arg_hash->{Domain} && + if ( $can_ipv6 && ! $arg_hash->{Domain} && ! ( $arg_hash->{LocalAddr} || $arg_hash->{LocalHost} ) && (my $peer = $arg_hash->{PeerAddr} || $arg_hash->{PeerHost})) { # set Domain to AF_INET/AF_INET6 if there is only one choice @@ -192,7 +192,7 @@ } } - # force initial blocking + # force initial blocking # otherwise IO::Socket::SSL->new might return undef if the # socket is nonblocking and it fails to connect immediatly # for real nonblocking behavior one should create a nonblocking @@ -201,7 +201,7 @@ # because Net::HTTPS simple redefines blocking() to {} (e.g # return undef) and IO::Socket::INET does not like this we - + # set Blocking only explicitly if it was set $arg_hash->{Blocking} = 1 if defined ($blocking); @@ -232,24 +232,24 @@ ); # common problem forgetting SSL_use_cert - # if client cert is given but SSL_use_cert undef assume that it + # if client cert is given but SSL_use_cert undef assume that it # should be set - if ( ! $is_server && ! defined $arg_hash->{SSL_use_cert} - && ( grep { $arg_hash->{$_} } qw(SSL_cert SSL_cert_file)) + if ( ! $is_server && ! defined $arg_hash->{SSL_use_cert} + && ( grep { $arg_hash->{$_} } qw(SSL_cert SSL_cert_file)) && ( grep { $arg_hash->{$_} } qw(SSL_key SSL_key_file)) ) { - $arg_hash->{SSL_use_cert} = 1 + $arg_hash->{SSL_use_cert} = 1 } - # SSL_key_file and SSL_cert_file will only be set in defaults if + # SSL_key_file and SSL_cert_file will only be set in defaults if # SSL_key|SSL_key_file resp SSL_cert|SSL_cert_file are not set in # $args_hash foreach my $k (qw( key cert )) { next if exists $arg_hash->{ "SSL_${k}" }; next if exists $arg_hash->{ "SSL_${k}_file" }; - $default_args{ "SSL_${k}_file" } = $is_server - ? "certs/server-${k}.pem" + $default_args{ "SSL_${k}_file" } = $is_server + ? "certs/server-${k}.pem" : "certs/client-${k}.pem"; - } + } # add only SSL_ca_* if not in args if ( ! exists $arg_hash->{SSL_ca_file} && ! exists $arg_hash->{SSL_ca_path} ) { @@ -259,7 +259,7 @@ $default_args{SSL_ca_path} = 'ca/' } } - + #Replace nonexistent entries with defaults %$arg_hash = ( %default_args, %$GLOBAL_CONTEXT_ARGS, %$arg_hash ); @@ -308,7 +308,7 @@ sub _set_rw_error { my ($self,$ssl,$rv) = @_; my $err = Net::SSLeay::get_error($ssl,$rv); - $SSL_ERROR = + $SSL_ERROR = $err == Net::SSLeay::ERROR_WANT_READ() ? SSL_WANT_READ : $err == Net::SSLeay::ERROR_WANT_WRITE() ? SSL_WANT_WRITE : return; @@ -371,8 +371,8 @@ $ssl ||= ${*$self}{'_SSL_object'}; $SSL_ERROR = undef; - my $timeout = exists $args->{Timeout} - ? $args->{Timeout} + my $timeout = exists $args->{Timeout} + ? $args->{Timeout} : ${*$self}{io_socket_timeout}; # from IO::Socket if ( defined($timeout) && $timeout>0 && $self->blocking(0) ) { DEBUG(2, "set socket to non-blocking to enforce timeout=$timeout" ); @@ -380,7 +380,7 @@ # enforce timeout with now non-blocking socket } else { # timeout does not apply because invalid or socket non-blocking - $timeout = undef; + $timeout = undef; } my $start = defined($timeout) && time(); @@ -408,7 +408,7 @@ my $vec = ''; vec($vec,$self->fileno,1) = 1; DEBUG(2, "waiting for fd to become ready: $SSL_ERROR" ); - $rv = + $rv = $SSL_ERROR == SSL_WANT_READ ? select( $vec,undef,undef,$timeout) : $SSL_ERROR == SSL_WANT_WRITE ? select( undef,$vec,undef,$timeout) : undef; @@ -423,7 +423,7 @@ delete ${*$self}{'_SSL_opening'}; ${*$self}{'_SSL_opened'} = -1; $self->blocking(1); # was blocking before - return + return } # socket is ready, try non-blocking connect again after recomputing timeout @@ -528,15 +528,15 @@ $SSL_ERROR = undef; #DEBUG(2,'calling ssleay::accept' ); - my $timeout = exists $args->{Timeout} - ? $args->{Timeout} + my $timeout = exists $args->{Timeout} + ? $args->{Timeout} : ${*$self}{io_socket_timeout}; # from IO::Socket if ( defined($timeout) && $timeout>0 && $socket->blocking(0) ) { # timeout was given and socket was blocking # enforce timeout with now non-blocking socket } else { # timeout does not apply because invalid or socket non-blocking - $timeout = undef; + $timeout = undef; } my $start = defined($timeout) && time(); @@ -560,7 +560,7 @@ if ( $timeout>0 ) { my $vec = ''; vec($vec,$socket->fileno,1) = 1; - $rv = + $rv = $SSL_ERROR == SSL_WANT_READ ? select( $vec,undef,undef,$timeout) : $SSL_ERROR == SSL_WANT_WRITE ? select( undef,$vec,undef,$timeout) : undef; @@ -573,7 +573,7 @@ delete ${*$self}{'_SSL_opening'}; ${*$socket}{'_SSL_opened'} = -1; $socket->blocking(1); # was blocking before - return + return } # socket is ready, try non-blocking accept again after recomputing timeout @@ -608,14 +608,14 @@ my ($self, $read_func, undef, $length, $offset) = @_; my $ssl = $self->_get_ssl_object || return; my $buffer=\$_[2]; - + $SSL_ERROR = undef; my $data = $read_func->($ssl, $length); if ( !defined($data)) { $self->_set_rw_error( $ssl,-1 ) || $self->error("SSL read error"); return; } - + $length = length($data); $$buffer = '' if !defined $$buffer; $offset ||= 0; @@ -629,9 +629,9 @@ sub read { my $self = shift; - return $self->generic_read( - $self->blocking ? \&Net::SSLeay::ssl_read_all : \&Net::SSLeay::read, - @_ + return $self->generic_read( + $self->blocking ? \&Net::SSLeay::ssl_read_all : \&Net::SSLeay::read, + @_ ); } @@ -757,7 +757,7 @@ # find first occurence of \n\n my $buf = ''; my $eon = 0; - while (1) { + while (1) { defined( Net::SSLeay::peek($ssl,1)) || last; # peek more, can block my $pending = Net::SSLeay::pending($ssl); $buf .= Net::SSLeay::peek( $ssl,$pending ); # will not block @@ -809,8 +809,7 @@ sub stop_SSL { my $self = shift || return _invalid_object(); my $stop_args = (ref($_[0]) eq 'HASH') ? $_[0] : {@_}; - return $self->error("SSL object not open") - if ! ${*$self}{'_SSL_opened'}; + $stop_args->{SSL_no_shutdown} = 1 if ! ${*$self}{_SSL_opened}; if (my $ssl = ${*$self}{'_SSL_object'}) { my $shutdown_done; @@ -819,7 +818,7 @@ } else { my $fast = $stop_args->{SSL_fast_shutdown}; my $status = Net::SSLeay::get_shutdown($ssl); - if ( $status == SSL_RECEIVED_SHUTDOWN + if ( $status == SSL_RECEIVED_SHUTDOWN || ( $status != 0 && $fast )) { # shutdown done $shutdown_done = 1; @@ -881,14 +880,6 @@ } -sub kill_socket { - my $self = shift; - shutdown($self, 2); - $self->close(SSL_no_shutdown => 1) if ${*$self}{'_SSL_opened'}; - delete(${*$self}{'_SSL_ctx'}); - return; -} - sub fileno { my $self = shift; my $fn = ${*$self}{'_SSL_fileno'}; @@ -944,7 +935,7 @@ return $result ? $socket : (bless($socket, $original_class) && ()); } else { DEBUG(2, "dont start handshake: $socket" ); - return $socket; # just return upgraded socket + return $socket; # just return upgraded socket } } @@ -978,14 +969,14 @@ ); if ( $Net::SSLeay::VERSION >= 1.30 ) { # I think X509_NAME_get_text_by_NID got added in 1.30 - $dispatcher{commonName} = sub { + $dispatcher{commonName} = sub { my $cn = Net::SSLeay::X509_NAME_get_text_by_NID( Net::SSLeay::X509_get_subject_name( shift ), NID_CommonName); $cn =~s{\0$}{}; # work around Bug in Net::SSLeay <1.33 $cn; } } else { - $dispatcher{commonName} = sub { + $dispatcher{commonName} = sub { croak "you need at least Net::SSLeay version 1.30 for getting commonName" } } @@ -1008,12 +999,12 @@ my ($self, $field) = @_; my $ssl = $self->_get_ssl_object or return; - my $cert = ${*$self}{_SSL_certificate} - ||= Net::SSLeay::get_peer_certificate($ssl) + my $cert = ${*$self}{_SSL_certificate} + ||= Net::SSLeay::get_peer_certificate($ssl) or return $self->error("Could not retrieve peer certificate"); if ($field) { - my $sub = $dispatcher{$field} or croak + my $sub = $dispatcher{$field} or croak "invalid argument for peer_certificate, valid are: ".join( " ",keys %dispatcher ). "\nMaybe you need to upgrade your Net::SSLeay"; return $sub->($cert); @@ -1036,7 +1027,7 @@ }, # rfc 2818 http => { - wildcards_in_cn => 0, + wildcards_in_cn => 1, wildcards_in_alt => 'anywhere', check_cn => 'when_only', }, @@ -1045,7 +1036,7 @@ # RFC3207 itself just says, that the client should expect the # domain name of the server in the certificate. It doesn't say # anything about wildcards, so I forbid them. It doesn't say - # anything about alt names, but other documents show, that alt + # anything about alt names, but other documents show, that alt # names should be possible. The check_cn value again is a guess. # Fix the spec! smtp => { @@ -1148,7 +1139,7 @@ } if ( ! $ipn and ( - $scheme->{check_cn} eq 'always' or + $scheme->{check_cn} eq 'always' or $scheme->{check_cn} eq 'when_only' and !$alt_dnsNames)) { $check_name->($commonName,$identity,$scheme->{wildcards_in_cn}) and return 1; @@ -1182,8 +1173,12 @@ $@ = $self->errstr; if (defined $error_trap and ref($error_trap) eq 'CODE') { $error_trap->($self, $self->errstr()."\n".$self->get_ssleay_error()); - } else { - $self->kill_socket; + } elsif ( ${*$self}{'_SSL_ioclass_upgraded'} ) { + # downgrade only + $self->stop_SSL; + } else { + # kill socket + $self->close } return; } @@ -1207,7 +1202,7 @@ sub DESTROY { my $self = shift || return; - $self->close(_SSL_in_DESTROY => 1, SSL_no_shutdown => 1) + $self->close(_SSL_in_DESTROY => 1, SSL_no_shutdown => 1) if ${*$self}{'_SSL_opened'}; delete(${*$self}{'_SSL_ctx'}); } @@ -1216,6 +1211,7 @@ #######Extra Backwards Compatibility Functionality####### sub socket_to_SSL { IO::Socket::SSL->start_SSL(@_); } sub socketToSSL { IO::Socket::SSL->start_SSL(@_); } +sub kill_socket { shift->close } sub issuer_name { return(shift()->peer_certificate("issuer")) } sub subject_name { return(shift()->peer_certificate("subject")) } @@ -1258,7 +1254,7 @@ #Redundant IO::Handle functionality sub getline { return(scalar shift->readline()) } -sub getlines { +sub getlines { return(shift->readline()) if wantarray(); croak("Use of getlines() not allowed in scalar context"); } @@ -1362,13 +1358,13 @@ # buffer was written and not block for the rest # SSL_MODE_ENABLE_PARTIAL_WRITE can be necessary for non-blocking because we # cannot guarantee, that the location of the buffer stays constant - Net::SSLeay::CTX_set_mode( $ctx, + Net::SSLeay::CTX_set_mode( $ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER|SSL_MODE_ENABLE_PARTIAL_WRITE); my $verify_mode = $arg_hash->{SSL_verify_mode}; - if ( $verify_mode != Net::SSLeay::VERIFY_NONE() and - ! Net::SSLeay::CTX_load_verify_locations( + if ( $verify_mode != Net::SSLeay::VERIFY_NONE() and + ! Net::SSLeay::CTX_load_verify_locations( $ctx, $arg_hash->{SSL_ca_file} || '',$arg_hash->{SSL_ca_path} || '') ) { if ( ! $arg_hash->{SSL_ca_file} && ! $arg_hash->{SSL_ca_path} ) { carp("No certificate verification because neither SSL_ca_file nor SSL_ca_path known"); @@ -1380,19 +1376,19 @@ if ($arg_hash->{'SSL_check_crl'}) { if (Net::SSLeay::OPENSSL_VERSION_NUMBER() >= 0x0090702f) { - Net::SSLeay::X509_STORE_set_flags( - Net::SSLeay::CTX_get_cert_store($ctx), - Net::SSLeay::X509_V_FLAG_CRL_CHECK() - ); - if ($arg_hash->{'SSL_crl_file'}) { - my $bio = Net::SSLeay::BIO_new_file($arg_hash->{'SSL_crl_file'}, 'r'); - my $crl = Net::SSLeay::PEM_read_bio_X509_CRL($bio); - if ( $crl ) { - Net::SSLeay::X509_STORE_add_crl(Net::SSLeay::CTX_get_cert_store($ctx), $crl); - } else { - return IO::Socket::SSL->error("Invalid certificate revocation list"); - } - } + Net::SSLeay::X509_STORE_set_flags( + Net::SSLeay::CTX_get_cert_store($ctx), + Net::SSLeay::X509_V_FLAG_CRL_CHECK() + ); + if ($arg_hash->{'SSL_crl_file'}) { + my $bio = Net::SSLeay::BIO_new_file($arg_hash->{'SSL_crl_file'}, 'r'); + my $crl = Net::SSLeay::PEM_read_bio_X509_CRL($bio); + if ( $crl ) { + Net::SSLeay::X509_STORE_add_crl(Net::SSLeay::CTX_get_cert_store($ctx), $crl); + } else { + return IO::Socket::SSL->error("Invalid certificate revocation list"); + } + } } else { return IO::Socket::SSL->error("CRL not supported for OpenSSL < v0.9.7b"); } @@ -1420,10 +1416,10 @@ # a chain of certificates my @x509 = ref($x509) eq 'ARRAY' ? @$x509: ($x509); my $cert = shift @x509; - Net::SSLeay::CTX_use_certificate( $ctx,$cert ) + Net::SSLeay::CTX_use_certificate( $ctx,$cert ) || return IO::Socket::SSL->error("Failed to use Certificate"); foreach my $ca (@x509) { - Net::SSLeay::CTX_add_extra_chain_cert( $ctx,$ca ) + Net::SSLeay::CTX_add_extra_chain_cert( $ctx,$ca ) || return IO::Socket::SSL->error("Failed to use Certificate"); } } elsif ( my $f = $arg_hash->{SSL_cert_file} ) { @@ -1436,7 +1432,7 @@ Net::SSLeay::CTX_set_tmp_dh( $ctx,$dh ) || return IO::Socket::SSL->error( "Failed to set DH from SSL_dh" ); } elsif ( my $f = $arg_hash->{SSL_dh_file} ) { - my $bio = Net::SSLeay::BIO_new_file( $f,'r' ) + my $bio = Net::SSLeay::BIO_new_file( $f,'r' ) || return IO::Socket::SSL->error( "Failed to open DH file $f" ); my $dh = Net::SSLeay::PEM_read_bio_DHparams($bio); Net::SSLeay::BIO_free($bio); @@ -1488,7 +1484,7 @@ my ($addr,$port,$session) = @_; $port ||= $addr =~s{:(\w+)$}{} && $1; # host:port my $key = "$addr:$port"; - return defined($session) + return defined($session) ? $cache->add_session($key, $session) : $cache->get_session($key); } @@ -1503,7 +1499,7 @@ my $self = shift; if ( my $ctx = $self->{context} ) { DEBUG( 3,"free ctx $ctx open=".join( " ",keys %CTX_CREATED_IN_THIS_THREAD )); - if ( %CTX_CREATED_IN_THIS_THREAD and + if ( %CTX_CREATED_IN_THIS_THREAD and delete $CTX_CREATED_IN_THIS_THREAD{$ctx} ) { # remove any verify callback for this context if ( $self->{has_verifycb}) { @@ -1587,7 +1583,7 @@ use strict; use IO::Socket::SSL; - my $client = IO::Socket::SSL->new("www.example.com:https") + my $client = IO::Socket::SSL->new("www.example.com:https") || warn "I encountered a problem: ".IO::Socket::SSL::errstr(); $client->verify_hostname( 'www.example.com','http' ) || die "hostname verification failed"; @@ -1642,7 +1638,7 @@ =item SSL_cipher_list If this option is set the cipher list for the connection will be set to the -given value, e.g. something like 'ALL:!LOW:!EXP:!ADH'. Look into the OpenSSL +given value, e.g. something like 'ALL:!LOW:!EXP:!ADH'. Look into the OpenSSL documentation (L<http://www.openssl.org/docs/apps/ciphers.html#CIPHER_STRINGS>) for more details. If this option is not used the openssl builtin default is used which is suitable @@ -1797,7 +1793,7 @@ the new() calls (or use set_default_context()) to make use of the cached sessions. The session cache size refers to the number of unique host/port pairs that can be stored at one time; the oldest sessions in the cache will be removed if new ones are -added. +added. =item SSL_session_cache @@ -1806,7 +1802,7 @@ This option is useful if you want to reuse the cache, but not the rest of the context. -A session cache object can be created using +A session cache object can be created using C<< IO::Socket::SSL::Session_Cache->new( cachesize ) >>. Use set_default_session_cache() to set a global cache object. @@ -1845,7 +1841,7 @@ =item SSL_fast_shutdown -If set to true only a unidirectional shutdown will be done, e.g. only the +If set to true only a unidirectional shutdown will be done, e.g. only the close_notify (see SSL_shutdown(3)) will be called. Otherwise a bidrectional shutdown will be done. If used within close() it defaults to true, if used within stop_SSL() it defaults to false. @@ -1883,7 +1879,7 @@ =item B<peer_certificate($field)> -If a peer certificate exists, this function can retrieve values from it. +If a peer certificate exists, this function can retrieve values from it. If no field is given the internal representation of certificate from Net::SSLeay is returned. The following fields can be queried: @@ -1908,7 +1904,7 @@ server, like example.org, example.com, *.example.com. It returns a list of (typ,value) with typ GEN_DNS, GEN_IPADD etc (these -constants are exported from IO::Socket::SSL). +constants are exported from IO::Socket::SSL). See Net::SSLeay::X509_get_subjectAltNames. =back @@ -1945,23 +1941,23 @@ =back -The scheme can be given either by specifying the name for one of the above predefined -schemes, by using a callback (see below) or by using a hash which can have the +The scheme can be given either by specifying the name for one of the above predefined +schemes, by using a callback (see below) or by using a hash which can have the following keys and values: =over 8 =item check_cn: 0|'always'|'when_only' -Determines if the common name gets checked. If 'always' it will always be checked +Determines if the common name gets checked. If 'always' it will always be checked (like in ldap), if 'when_only' it will only be checked if no names are given in subjectAltNames (like in http), for any other values the common name will not be checked. =item wildcards_in_alt: 0|'leftmost'|'anywhere' Determines if and where wildcards in subjectAltNames are possible. If 'leftmost' -only cases like *.example.org will be possible (like in ldap), for 'anywhere' -www*.example.org is possible too (like http), dangerous things like but www.*.org +only cases like *.example.org will be possible (like in ldap), for 'anywhere' +www*.example.org is possible too (like http), dangerous things like but www.*.org or even '*' will not be allowed. =item wildcards_in_cn: 0|'leftmost'|'anywhere' @@ -1984,7 +1980,7 @@ For read and write errors on non-blocking sockets, this method may include the string C<SSL wants a read first!> or C<SSL wants a write first!> meaning that the other side is expecting to read from or write to the socket and wants to be satisfied before you -get to do anything. But with version 0.98 you are better comparing the global exported +get to do anything. But with version 0.98 you are better comparing the global exported variable $SSL_ERROR against the exported symbols SSL_WANT_READ and SSL_WANT_WRITE. =item B<opened()> @@ -2002,8 +1998,8 @@ If you have a class that inherits from IO::Socket::SSL and you want the $socket to be blessed into your own class instead, use MyClass->start_SSL($socket) to achieve the desired effect. -Note that if start_SSL() fails in SSL negotiation, $socket will remain blessed in its -original class. For non-blocking sockets you better just upgrade the socket to +Note that if start_SSL() fails in SSL negotiation, $socket will remain blessed in its +original class. For non-blocking sockets you better just upgrade the socket to IO::Socket::SSL and call accept_SSL or connect_SSL and the upgraded object. To just upgrade the socket set B<SSL_startHandshake> explicitly to 0. If you call start_SSL w/o this parameter it will revert to blocking behavior for accept_SSL and connect_SSL. @@ -2020,7 +2016,7 @@ Will return true if it suceeded and undef if failed. This might be the case for non-blocking sockets. In this case $! is set to EAGAIN and the ssl error to -SSL_WANT_READ or SSL_WANT_WRITE. In this case the call should be retried again with +SSL_WANT_READ or SSL_WANT_WRITE. In this case the call should be retried again with the same arguments once the socket is ready is until it succeeds. =item B<< IO::Socket::SSL->new_from_fd($fd, ...) >> @@ -2098,12 +2094,12 @@ =head1 IPv6 Support for IPv6 with IO::Socket::SSL is expected to work and basic testing is done. -If IO::Socket::INET6 is available it will automatically use it instead of -IO::Socket::INET4. +If IO::Socket::INET6 is available it will automatically use it instead of +IO::Socket::INET4. Please be aware of the associated problems: If you give a name as a host and the host resolves to both IPv6 and IPv4 it will try IPv6 first and if there is no IPv6 -connectivity it will fail. +connectivity it will fail. To avoid these problems you can either force IPv4 by specifying and AF_INET as the Domain (this is per socket) or load IO::Socket::SSL with the option 'inet4' @@ -2125,7 +2121,7 @@ If you are having problems using IO::Socket::SSL despite the fact that can recite backwards the section of this documentation labelled 'Using SSL', you should try enabling debugging. To specify the debug level, pass 'debug#' (where # is a number from 0 to 3) to IO::Socket::SSL -when calling it. +when calling it. The debug level will also be propagated to Net::SSLeay::trace, see also L<Net::SSLeay>: =over 4 @@ -2156,7 +2152,7 @@ =head1 BUGS IO::Socket::SSL is not threadsafe. -This is because IO::Socket::SSL is based on Net::SSLeay which +This is because IO::Socket::SSL is based on Net::SSLeay which uses a global object to access some of the API of openssl and is therefore not threadsafe. It might probably work if you don't use SSL_verify_callback and @@ -2196,6 +2192,9 @@ use IO::Socket::SSL->start_SSL() instead +=item kill_socket() + +use close() instead =item get_peer_certificate() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.33/t/core.t new/IO-Socket-SSL-1.34/t/core.t --- old/IO-Socket-SSL-1.33/t/core.t 2009-04-01 09:47:04.000000000 +0200 +++ new/IO-Socket-SSL-1.34/t/core.t 2010-11-01 09:52:07.000000000 +0100 @@ -236,7 +236,7 @@ my $self = shift; print $self "This server is SSL only"; $error_trapped = 1; - $self->kill_socket; + $self->close; } $error_trapped or print "not "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Socket-SSL-1.33/t/startssl-failed.t new/IO-Socket-SSL-1.34/t/startssl-failed.t --- old/IO-Socket-SSL-1.33/t/startssl-failed.t 1970-01-01 01:00:00.000000000 +0100 +++ new/IO-Socket-SSL-1.34/t/startssl-failed.t 2010-11-01 09:45:43.000000000 +0100 @@ -0,0 +1,92 @@ +#!perl -w +# Before `make install' is performed this script should be runnable with +# `make test'. After `make install' it should work as `perl t/nonblock.t' + + +use Net::SSLeay; +use Socket; +use IO::Socket::SSL; +use IO::Select; +use Errno qw(EAGAIN EINPROGRESS ); +use strict; + +use vars qw( $SSL_SERVER_ADDR ); +do "t/ssl_settings.req" || do "ssl_settings.req"; + +if ( grep { $^O =~m{$_} } qw( MacOS VOS vmesa riscos amigaos ) ) { + print "1..0 # Skipped: fork not implemented on this platform\n"; + exit +} + +$|=1; +print "1..9\n"; + + +my $server = IO::Socket::INET->new( + LocalAddr => $SSL_SERVER_ADDR, + Listen => 2, + ReuseAddr => 1, +); +print("not ok\n"),exit if !$server; +ok("Server Initialization"); +my ($SSL_SERVER_PORT) = unpack_sockaddr_in( $server->sockname ); + + +defined( my $pid = fork() ) || die $!; +if ( $pid == 0 ) { + client(); +} else { + server(); + #kill(9,$pid); + wait; +} + + +sub client { + close($server); + my $client = IO::Socket::INET->new( "$SSL_SERVER_ADDR:$SSL_SERVER_PORT" ) + or return fail("client tcp connect"); + ok("client tcp connect"); + + IO::Socket::SSL->start_SSL($client) and + return fail('start ssl should fail'); + ok("startssl client failed: $SSL_ERROR"); + + UNIVERSAL::isa($client,'IO::Socket::INET') or + return fail('downgrade socket after error'); + ok('downgrade socket after error'); + + print $client "foo\n" or return fail("send to server: $!"); + ok("send to server"); + my $l; + while (defined($l = <$client>)) { + if ( $l =~m{bar\n} ) { + return ok('client receive non-ssl data'); + } + #warn "XXXXXXXX $l"; + } + fail("receive non-ssl data"); +} + +sub server { + my $csock = $server->accept or return fail('tcp accept'); + ok('tcp accept'); + print $csock "This is no SSL handshake\n"; + ok('send non-ssl data'); + + alarm(10); + my $l; + while (defined( $l = <$csock>)) { + if ($l =~m{foo\n} ) { + print $csock "bar\n"; + return ok("received non-ssl data"); + } + #warn "XXXXXXXXX $l"; + } + fail('no data from client'.$!); +} + + +sub ok { print "ok #$_[0]\n"; return 1 } +sub fail { print "not ok #$_[0]\n"; return } + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Tue Nov 2 13:11:56 CET 2010. -------- --- sysvinit/sysvinit.changes 2010-10-27 12:47:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2010-10-29 17:21:39.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 29 17:20:56 CEST 2010 - werner(a)suse.de + +- Add newline after blogger message + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.qmgdut/_old 2010-11-02 13:09:52.000000000 +0100 +++ /var/tmp/diff_new_pack.qmgdut/_new 2010-11-02 13:09:52.000000000 +0100 @@ -29,7 +29,7 @@ Group: System/Base AutoReqProv: on Version: 2.88 -Release: 21 +Release: 22 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel ++++++ showconsole-1.13.dif ++++++ --- /var/tmp/diff_new_pack.qmgdut/_old 2010-11-02 13:09:52.000000000 +0100 +++ /var/tmp/diff_new_pack.qmgdut/_new 2010-11-02 13:09:52.000000000 +0100 @@ -1,4 +1,27 @@ ---- .dummy -+++ .dummy 2010-10-21 09:54:55.000000000 +0000 -@@ -0,0 +1 @@ -+Just a dummy, remove for a real patch +--- libconsole.c ++++ libconsole.c 2010-10-29 15:16:44.691925956 +0000 +@@ -707,11 +707,12 @@ static void parselog(unsigned char *buf, + static void copylog(const unsigned char *buf, const size_t s) + { + lock(&llock); +- if (!nl) { ++ if (!nl) + addlog('\n'); +- nl = 1; +- } + storelog(buf, s); ++ if (buf[s-1] != '\n') ++ addlog('\n'); ++ nl = 1; + unlock(&llock); + } + +@@ -770,7 +771,7 @@ void prepareIO(void (*rfunc)(int), void + (void)mkfifo(fifo_name, 0600); + errno = 0; + if (!stat(fifo_name, &st) && S_ISFIFO(st.st_mode)) { +- if ((fdfifo = open(fifo_name, O_RDONLY|O_NOCTTY|O_CLOEXEC)) < 0) ++ if ((fdfifo = open(fifo_name, O_RDWR|O_NOCTTY|O_CLOEXEC)) < 0) + warn("can not open named fifo %s: %s\n", fifo_name, strerror(errno)); + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openobex for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package openobex for openSUSE:Factory checked in at Tue Nov 2 13:05:03 CET 2010. -------- --- openobex/openobex.changes 2010-03-27 02:01:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/openobex/openobex.changes 2010-10-31 19:04:07.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openobex.spec ++++++ --- /var/tmp/diff_new_pack.BIvEGu/_old 2010-11-02 13:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.BIvEGu/_new 2010-11-02 13:04:52.000000000 +0100 @@ -23,7 +23,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/Other Version: 1.5 -Release: 1 +Release: 4 Summary: Open Source Implementation of the Object Exchange (OBEX) Protocol Url: http://openobex.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 @@ -78,7 +78,7 @@ autoreconf -f -i -v %configure --disable-static --with-pic \ --enable-apps -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %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 xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Tue Nov 2 13:04:38 CET 2010. -------- --- xorg-x11-server/xorg-x11-server.changes 2010-10-24 12:10:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2010-11-02 00:57:44.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Nov 1 23:47:32 UTC 2010 - sndirsch(a)novell.com + +- xorg-server 1.9.2 + * This is a brown-bag release to address an issue with the + xorg-server-1.9.1 tarball. The version of util-macros used to + build the 1.9.1 tarball was modified and could cause problems + due to the absence of the -fno-strict-aliasing CFLAG. This + tarball was packaged using the unmodified util-macros. + This additionally contains a fix for a regression in XQuartz + found by Christof Wolf. + +------------------------------------------------------------------- +Mon Oct 25 12:16:17 UTC 2010 - sndirsch(a)novell.com + +- commit-5c6a2f9.diff + * retain obsolete pixmapPrivate, just for ABI compatibility + * reenable patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xorg-server-1.9.1.tar.bz2 New: ---- xorg-server-1.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.amG6TW/_old 2010-11-02 13:00:26.000000000 +0100 +++ /var/tmp/diff_new_pack.amG6TW/_new 2010-11-02 13:00:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-server (Version 7.5_1.9.1) +# spec file for package xorg-x11-server (Version 7.5_1.9.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ %define moblin 0 Name: xorg-x11-server -%define dirsuffix 1.9.1 +%define dirsuffix 1.9.2 %define vnc 0 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel ### udev support (broken on openSUSE 11.2, see also bnc #589997) @@ -241,7 +241,7 @@ %patch217 -p1 %patch218 -p1 %patch220 -p1 -#%patch221 -p1 +%patch221 -p1 %if %moblin %patch300 -p1 %endif ++++++ commit-5c6a2f9.diff ++++++ --- /var/tmp/diff_new_pack.amG6TW/_old 2010-11-02 13:00:26.000000000 +0100 +++ /var/tmp/diff_new_pack.amG6TW/_new 2010-11-02 13:00:26.000000000 +0100 @@ -50,11 +50,12 @@ index c9b261d..b979884 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h -@@ -765,7 +765,6 @@ typedef struct _ScrnInfoRec { +@@ -765,7 +765,7 @@ typedef struct _ScrnInfoRec { /* Allow screens to be enabled/disabled individually */ Bool vtSema; - DevUnion pixmapPrivate; /* saved devPrivate from pixmap */ ++ DevUnion pixmapPrivate; /* XXX obsoleted; just for ABI compatibility */ /* hw cursor moves at SIGIO time */ Bool silkenMouse; ++++++ xorg-server-1.9.1.tar.bz2 -> xorg-server-1.9.2.tar.bz2 ++++++ ++++ 113901 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 upower for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package upower for openSUSE:Factory checked in at Tue Nov 2 13:00:09 CET 2010. -------- --- GNOME/upower/upower.changes 2010-10-05 10:23:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/upower/upower.changes 2010-10-31 19:04:59.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upower.spec ++++++ --- /var/tmp/diff_new_pack.e5ZifU/_old 2010-11-02 12:59:17.000000000 +0100 +++ /var/tmp/diff_new_pack.e5ZifU/_new 2010-11-02 12:59:17.000000000 +0100 @@ -21,7 +21,7 @@ Name: upower Summary: Power Device Enumeration Framework Version: 0.9.6 -Release: 1 +Release: 2 License: GPLv2+ Url: http://upower.freedesktop.org/ Group: System/Daemons @@ -99,7 +99,7 @@ --disable-static \ --libexecdir=%{_libexecdir}/upower \ --enable-gtk-doc -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %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 sparse for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package sparse for openSUSE:Factory checked in at Tue Nov 2 12:59:02 CET 2010. -------- --- sparse/sparse.changes 2010-07-16 09:23:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/sparse/sparse.changes 2010-10-31 19:04:49.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sparse.spec ++++++ --- /var/tmp/diff_new_pack.vB3x0Q/_old 2010-11-02 12:16:15.000000000 +0100 +++ /var/tmp/diff_new_pack.vB3x0Q/_new 2010-11-02 12:16:15.000000000 +0100 @@ -23,7 +23,7 @@ License: Open Software License 1.1 Group: Development/Tools/Building Version: 0.4.2.git1 -Release: 2 +Release: 5 %define gitrev v0.4.2-26-g8832df8 AutoReqProv: on Url: https://sparse.wiki.kernel.org/index.php/Main_Page @@ -71,7 +71,7 @@ %patch0 -p1 %build -make %{?jobs:-j%jobs} PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} \ +make %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} \ PKGCONFIGDIR=%{_datadir}/pkgconfig CFLAGS="%{optflags}" %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 liblazy1 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package liblazy1 for openSUSE:Factory checked in at Tue Nov 2 12:16:04 CET 2010. -------- --- liblazy1/liblazy1.changes 2009-12-18 23:07:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/liblazy1/liblazy1.changes 2010-10-31 19:03:45.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblazy1.spec ++++++ --- /var/tmp/diff_new_pack.mhSr3k/_old 2010-11-02 12:15:57.000000000 +0100 +++ /var/tmp/diff_new_pack.mhSr3k/_new 2010-11-02 12:15:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package liblazy1 (Version 0.2) # -# 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 @@ -22,7 +22,7 @@ BuildRequires: dbus-1-devel pkgconfig Summary: Liblazy - D-Bus methods provided for convenience Version: 0.2 -Release: 65 +Release: 73 #liblazy 0.2 was last used in 10.3 Provides: liblazy = %{version} Obsoletes: liblazy <= %{version} @@ -66,7 +66,7 @@ %build %configure --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gtkhtml2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package gtkhtml2 for openSUSE:Factory checked in at Tue Nov 2 11:41:09 CET 2010. -------- --- GNOME/gtkhtml2/gtkhtml2.changes 2010-10-16 16:37:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtkhtml2/gtkhtml2.changes 2010-10-29 00:26:14.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 28 18:25:10 EDT 2010 - vuntz(a)opensuse.org + +- Changes libgtkhtml-3_14-19 to have a gtkhtml-3_14 Provides + instead of gtkhtml2-3_14 Provides. This makes the lang package + installable. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml2.spec ++++++ --- /var/tmp/diff_new_pack.3h8IUa/_old 2010-11-02 11:39:52.000000000 +0100 +++ /var/tmp/diff_new_pack.3h8IUa/_new 2010-11-02 11:39:52.000000000 +0100 @@ -20,7 +20,7 @@ Name: gtkhtml2 Version: 3.32.0 -Release: 2 +Release: 3 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) License: GPLv2+ ; LGPLv2.1+ Summary: Lightweight HTML rendering/printing/editing engine @@ -50,7 +50,7 @@ Group: System/Libraries Recommends: gtkhtml-3_14-lang # For the lang package to be installable -Provides: %{name}-3_14 = %{version} +Provides: gtkhtml-3_14 = %{version} Provides: %{name} = %{version} # Note: we keep <= (and a rpmlint warning...) until we get a version higher than 3.32.0 (when this provides/obsoletes was introduced) Obsoletes: %{name} <= %{version} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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