Hello community, here is the log from the commit of package pavuk for openSUSE:Factory checked in at 2014-05-02 14:01:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pavuk (Old) and /work/SRC/openSUSE:Factory/.pavuk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pavuk" Changes: -------- --- /work/SRC/openSUSE:Factory/pavuk/pavuk.changes 2011-12-25 17:37:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pavuk.new/pavuk.changes 2014-05-02 14:01:28.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 27 19:48:26 UTC 2014 - crrodrig...@opensuse.org + +- pavuk-nossl2.patch: fix build without SSLv2 +- pavuk-bugs.patch previous patch was not enough to make it + compile successfully, fixes open() arguments and a typo. + +------------------------------------------------------------------- New: ---- pavuk-bugs.patch pavuk-nossl2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pavuk.spec ++++++ --- /var/tmp/diff_new_pack.cpWZI7/_old 2014-05-02 14:01:29.000000000 +0200 +++ /var/tmp/diff_new_pack.cpWZI7/_new 2014-05-02 14:01:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pavuk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: pavuk BuildRequires: dante-devel BuildRequires: db-devel @@ -30,6 +31,8 @@ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch1: pavuk-ld-add-needed.patch +Patch2: pavuk-nossl2.patch +Patch3: pavuk-bugs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,14 +51,12 @@ %prep %setup -q %patch1 +%patch2 -p1 +%patch3 -p1 %build CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -Wall" \ -./configure \ ---prefix=%{_prefix} \ ---sysconfdir=%{_sysconfdir} \ ---mandir=%{_mandir} \ ---enable-debug +%configure --enable-debug make %{?jobs:-j%jobs} %install ++++++ pavuk-bugs.patch ++++++ --- pavuk-0.9.35.orig/src/tools.c +++ pavuk-0.9.35/src/tools.c @@ -1726,7 +1726,7 @@ int tl_save_text_file(char *filename, ch if(length < 0) length = strlen(content); - if((fd = open(filename, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC), 0644) < 0) + if((fd = open(filename, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, 0644) < 0)) { xperror(filename); return -1; --- pavuk-0.9.35.orig/src/dns.c +++ pavuk-0.9.35/src/dns.c @@ -673,7 +673,7 @@ char *dns_get_abs_addr_ip(abs_addr * had void *addr; char pom[128]; struct in_addr ia4; - struct in6_addr *ia6; + struct in6_addr ia6; switch (haddr->family) { ++++++ pavuk-nossl2.patch ++++++ --- pavuk-0.9.35.orig/src/myssl_openssl.c +++ pavuk-0.9.35/src/myssl_openssl.c @@ -543,9 +543,11 @@ bufio *my_ssl_do_connect(doc * docp, buf switch (cfg.ssl_version) { +#ifndef OPENSSL_NO_SSL2 case 2: method = SSLv2_client_method(); break; +#endif case 3: method = SSLv3_client_method(); break; @@ -564,6 +566,9 @@ bufio *my_ssl_do_connect(doc * docp, buf /* Bugs compatibility */ SSL_CTX_set_options(con->ssl_ctx, SSL_OP_ALL); +#ifdef SSL_OP_NO_COMPRESSION + SSL_CTX_set_options(con->ssl_ctx, SSL_OP_NO_COMPRESSION); +#endif /* Modes of SSL_send() */ SSL_CTX_set_mode(con->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); SSL_CTX_set_mode(con->ssl_ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
