September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit libraw1394 for openSUSE:Factory
by root＠hilbert.suse.de 18 Sep '14

18 Sep '14

Hello community, here is the log from the commit of package libraw1394 for openSUSE:Factory checked in at 2014-09-18 07:12:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw1394 (Old) and /work/SRC/openSUSE:Factory/.libraw1394.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libraw1394" Changes: -------- --- /work/SRC/openSUSE:Factory/libraw1394/libraw1394.changes 2013-03-24 21:45:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libraw1394.new/libraw1394.changes 2014-09-18 07:12:01.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 4 18:51:55 UTC 2014 - crrodriguez(a)opensuse.org + +- libraw1394-exports.patch: Only symbols prefixed with + raw1394_ are part of the public API, everything else + is private. + +------------------------------------------------------------------- New: ---- libraw1394-exports.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw1394.spec ++++++ --- /var/tmp/diff_new_pack.F4erog/_old 2014-09-18 07:12:03.000000000 +0200 +++ /var/tmp/diff_new_pack.F4erog/_new 2014-09-18 07:12:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libraw1394 # -# Copyright (c) 2013 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 @@ -28,12 +28,14 @@ Obsoletes: libraw1394-64bit %endif # +BuildRequires: libtool BuildRequires: openjade-devel BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.xz Source1: baselibs.conf -Patch: libraw1394.no-isodump.patch +Patch0: libraw1394.no-isodump.patch +Patch1: libraw1394-exports.patch %description The Linux kernel's IEEE 1394 subsystem provides access to the raw 1394 @@ -101,11 +103,10 @@ %prep %setup -q -%patch -p1 - +%patch0 -p1 +%patch1 -p1 %build -#autoreconf --force --install -export CFLAGS="%optflags" +autoreconf --force --install %configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} all ++++++ libraw1394-exports.patch ++++++ --- libraw1394-2.1.0.orig/src/Makefile.am +++ libraw1394-2.1.0/src/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libraw1394.la -libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ +libraw1394_la_LDFLAGS = -export-symbols-regex '^raw1394_' -no-undefined -version-info @lt_major@:@lt_revision@:@lt_age@ libraw1394_la_SOURCES = \ main.c \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.3001 for openSUSE:13.1:Update
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package patchinfo.3001 for openSUSE:13.1:Update checked in at 2014-09-17 22:48:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.3001 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.3001.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.3001" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="894575" tracker="bnc">VUL-0: CVE-2014-3613: curl: libcurl cookie leaks</issue> <issue id="895991" tracker="bnc">VUL-0: CVE-2014-3620: curl: cookies accepted for TLDs</issue> <issue id="CVE-2014-3620" tracker="cve" /> <issue id="CVE-2014-3613" tracker="cve" /> <category>security</category> <rating>important</rating> <packager>vitezslav_cizek</packager> <description> libcurl was updated to fix security issues: CVE-2014-3613: Cookies for hosts specified by numeric IP could be assigned or used for other numeric IP hosts if portions of the numerics were the same. CVE-2014-3620: libcurl allowed cookies to be set for toplevel domains, making them to broad. </description> <summary>curl: security update</summary> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit curl for openSUSE:13.1:Update
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package curl for openSUSE:13.1:Update checked in at 2014-09-17 22:48:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/curl (Old) and /work/SRC/openSUSE:13.1:Update/.curl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "curl" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.WHyzVQ/_old 2014-09-17 22:48:14.000000000 +0200 +++ /var/tmp/diff_new_pack.WHyzVQ/_new 2014-09-17 22:48:14.000000000 +0200 @@ -1 +1 @@ -<link package='curl.2733' cicount='copy' /> +<link package='curl.3001' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit curl for openSUSE:12.3:Update
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package curl for openSUSE:12.3:Update checked in at 2014-09-17 22:48:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/curl (Old) and /work/SRC/openSUSE:12.3:Update/.curl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "curl" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.m2I5J5/_old 2014-09-17 22:48:12.000000000 +0200 +++ /var/tmp/diff_new_pack.m2I5J5/_new 2014-09-17 22:48:12.000000000 +0200 @@ -1 +1 @@ -<link package='curl.2733' cicount='copy' /> +<link package='curl.3001' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit curl.3001 for openSUSE:12.3:Update
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package curl.3001 for openSUSE:12.3:Update checked in at 2014-09-17 22:48:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/curl.3001 (Old) and /work/SRC/openSUSE:12.3:Update/.curl.3001.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "curl.3001" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:12.3:Update/.curl.3001.new/curl.changes 2014-09-17 22:48:08.000000000 +0200 @@ -0,0 +1,1112 @@ +------------------------------------------------------------------- +Tue Sep 2 15:56:05 UTC 2014 - vcizek(a)suse.com + +- fix for CVE-2014-3613 (bnc#894575) + * libcurl cookie leaks + * added curl-CVE-2014-3613.patch + +------------------------------------------------------------------- +Wed Apr 2 10:43:38 UTC 2014 - vcizek(a)suse.com + +- fixes for two security vulnerabilities: + * CVE-2014-0138 (bnc#868627) + - curl: wrong re-use of connections + - added: curl-CVE-2014-0138.patch + - removed: curl-CVE-2014-138-bad-reuse.patch + * CVE-2014-0139 (bnc#868629) + - curl: IP address wildcard certificate validation + - added: curl-CVE-2014-0139.patch + - removed: curl-CVE-2014-139-reject-cert-ip-wildcards.patch + +------------------------------------------------------------------- +Mon Mar 17 11:16:10 UTC 2014 - vcizek(a)suse.com + +- fixes for two security vulnerabilities: + * CVE-2014-138 (bnc#868627) + - curl: wrong re-use of connections + - added curl-CVE-2014-138-bad-reuse.patch + * CVE-2014-139 (bnc#868629) + - curl: IP address wildcard certificate validation + - curl-CVE-2014-139-reject-cert-ip-wildcards.patch + +------------------------------------------------------------------- +Tue Jan 14 12:33:28 UTC 2014 - vcizek(a)suse.com + +- fix for CVE-2014-0015 (bnc#858673) + * re-use of wrong HTTP NTLM connection in libcurl + * added curl-CVE-2014-0015-NTLM_connection_reuse.patch +- fix test failure because of an expired cookie (bnc#862144) + * added curl-test172_cookie_expiration.patch + +------------------------------------------------------------------- +Mon Dec 2 11:26:06 UTC 2013 - vcizek(a)suse.com + +- fix CVE-2013-4545 (bnc#849596) + = acknowledge VERIFYHOST without VERIFYPEER + +------------------------------------------------------------------- +Thu Jun 13 10:06:23 UTC 2013 - vcizek(a)suse.com + +- fix for CVE-2013-2174 (bnc#824517) + added curl-CVE-2013-2174.patch + +------------------------------------------------------------------- +Fri Apr 12 11:01:51 UTC 2013 - vcizek(a)suse.com + +- fixed CVE-2013-1944 (bnc#814655) + added curl-CVE-2013-1944.patch + +------------------------------------------------------------------- +Thu Feb 7 10:54:15 UTC 2013 - vcizek(a)suse.com + +- fixed CVE-2013-0249 (bnc#802411) +- refreshed patches + +------------------------------------------------------------------- +Fri Jan 11 21:34:38 CET 2013 - sbrabec(a)suse.cz + +- Break build loop and make GPG signature verification optional. + +------------------------------------------------------------------- +Tue Nov 27 20:05:00 CET 2012 - sbrabec(a)suse.cz + +- Verify GPG signature. + +------------------------------------------------------------------- +Tue Nov 20 23:43:24 UTC 2012 - crrodriguez(a)opensuse.org + +- Curl 7.28.1 +* FTP: prevent the multi interface from blocking Obsoletes + curl-ftp-prevent-the-multi-interface-from-blocking.patch +* don't send '#' fragments when using proxy +* OpenSSL: Disable SSL/TLS compression - avoid the "CRIME" attack +* TFTP: handle resend +* memory leak: CURLOPT_RESOLVE with multi interface +* SSL: Several SSL-backend related fixes + +------------------------------------------------------------------- +Sun Nov 4 19:57:33 UTC 2012 - gber(a)opensuse.org + +- added curl-ftp-prevent-the-multi-interface-from-blocking.patch in + order to prevent the multi interface from blocking when using ftp + and the remote end responds very slowly (sf#3579064) + +------------------------------------------------------------------- +Sun Jul 29 22:14:25 UTC 2012 - crrodriguez(a)opensuse.org + +- Curl 7.27.0 +* support metalinks +* Add sasl authentication support +* various bugfixes +- Fix previous change, _GNU_SOURCE --> AC_USE_SYSTEM_EXTENSIONS + +------------------------------------------------------------------- +Mon Jul 9 13:12:24 UTC 2012 - dnh(a)opensuse.org + +- define _GNU_SOURCE for oS/SLES <= 11.4, as O_CLOEXEC is + defined inside a ifdef __USE_GNU + +------------------------------------------------------------------- +Sat May 12 23:24:56 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 7.25.0 +* Added CURLOPT_TCP_KEEPALIVE, CURLOPT_TCP_KEEPIDLE, + CURLOPT_TCP_KEEPINTVL +* use new library-side TCP_KEEPALIVE options +* Added a new CURLOPT_MAIL_AUTH option +* Added support for --mail-auth +* (for more see the shipped CHANGES file) + +------------------------------------------------------------------- +Wed Feb 8 00:45:18 UTC 2012 - crrodriguez(a)opensuse.org + +- Problem with the c-ares backend, workaround for [bnc#745534] + +------------------------------------------------------------------- +Thu Feb 2 18:47:10 UTC 2012 - crrodriguez(a)opensuse.org + +- Update to version curl 7.24.0 +- refresh patches to fix broken build + +------------------------------------------------------------------- +Wed Jan 18 13:49:56 CET 2012 - dmueller(a)suse.de + +- use the rpmoptflags unconditionally, don't do own compiler flag + magic. Fixes debuginfo package built + +------------------------------------------------------------------- +Wed Dec 28 10:30:28 UTC 2011 - mmarek(a)suse.cz + +- Package /usr/share/aclocal to avoid build dependency on automake. + +------------------------------------------------------------------- +Wed Nov 30 22:39:35 UTC 2011 - crrodriguez(a)opensuse.org + +- Use O_CLOEXEC in library code. + +------------------------------------------------------------------- +Tue Nov 29 11:51:38 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + +------------------------------------------------------------------- +Tue Nov 29 08:20:23 UTC 2011 - idoenmez(a)suse.de + +- Use original source tarball + +------------------------------------------------------------------- +Mon Nov 28 12:00:00 UTC 2011 - opensuse(a)dstoecker.de + +- Update to version 7.23.1: + + Empty headers can be sent in HTTP requests by terminating with a semicolon + + SSL session sharing support added to curl_share_setopt() + + Added support to MAIL FROM for the optional SIZE parameter + + smtp: Added support for NTLM authentication + + curl tool: code split into tool_*.[ch] files + + lots of bugfixes +------------------------------------------------------------------- +Mon Oct 3 15:44:17 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 7.22.0: + + Added CURLOPT_GSSAPI_DELEGATION + + Added support for NTLM delegation to Samba's winbind daemon + helper ntlm_auth + + Display notes from setup file in testcurl.pl + + BSD-style lwIP TCP/IP stack experimental support on Windows + + OpenSSL: Use SSL_MODE_RELEASE_BUFFERS if available + + --delegation was added to set CURLOPT_GSSAPI_DELEGATION + + nss: start with no database if the selected database is broken + + telnet: allow programatic use on Windows + + for a list of bugfixes, see + http://curl.haxx.se/changes.html#7_22_0 +- Drop curl-openssl-release-buffers.patch: fixed upstream. +- Add curl-fix-m4.patch: Use 'x' in configure scripts. Fixes issues + when configure is run with -Werror -Wall. + +------------------------------------------------------------------- +Sun Sep 18 00:10:42 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Fri Sep 16 17:22:44 UTC 2011 - jengelh(a)medozas.de + +- Add curl-devel to baselibs + +------------------------------------------------------------------- ++++ 915 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.curl.3001.new/curl.changes New: ---- baselibs.conf curl-7.28.1.tar.lzma curl-7.28.1.tar.lzma.asc curl-CVE-2013-0249.patch curl-CVE-2013-1944.patch curl-CVE-2013-2174.patch curl-CVE-2013-4545.patch curl-CVE-2014-0015-NTLM_connection_reuse.patch curl-CVE-2014-0138.patch curl-CVE-2014-0139.patch curl-CVE-2014-3613.patch curl-test172_cookie_expiration.patch curl.changes curl.keyring curl.spec dont-mess-with-rpmoptflags.diff libcurl-ocloexec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ # # spec file for package curl # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_without openssl %bcond_with mozilla_nss %bcond_without testsuite Name: curl Version: 7.28.1 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT Group: Productivity/Networking/Web/Utilities Url: http://curl.haxx.se/ Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source2: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc Source3: baselibs.conf Source4: %{name}.keyring Patch: libcurl-ocloexec.patch Patch1: dont-mess-with-rpmoptflags.diff Patch2: curl-CVE-2013-0249.patch Patch3: curl-CVE-2013-1944.patch Patch4: curl-CVE-2013-4545.patch Patch5: curl-CVE-2013-2174.patch Patch6: curl-CVE-2014-0015-NTLM_connection_reuse.patch Patch7: curl-test172_cookie_expiration.patch Patch8: curl-CVE-2014-0138.patch Patch9: curl-CVE-2014-0139.patch Patch10: curl-CVE-2014-3613.patch # Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run one-shot check by "gpg-offline --verify --package=curl curl-*.asc". %if 0%{?VERIFY_SIG} BuildRequires: gpg-offline %endif BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: lzma BuildRequires: openldap2-devel BuildRequires: pkg-config BuildRequires: zlib-devel %if %{with openssl} BuildRequires: openssl-devel %endif %if %{with mozilla_nss} BuildRequires: mozilla-nss-devel %endif BuildRequires: krb5-devel BuildRequires: libssh2-devel BuildRequires: openssh %if 0%{?_with_stunnel:1} # used by the testsuite BuildRequires: stunnel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 Obsoletes: curl-64bit %endif %description Curl is a client to get documents and files from or send documents to a server using any of the supported protocols (HTTP, HTTPS, FTP, FTPS, TFTP, DICT, TELNET, LDAP, or FILE). The command is designed to work without user interaction or any kind of interactivity. %package -n libcurl4 Summary: Version 4 of cURL shared library Group: Productivity/Networking/Web/Utilities %description -n libcurl4 The cURL shared library version 4 for accessing data using different network protocols. %package -n libcurl-devel Summary: A Tool for Transferring Data from URLs Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libcurl4 = %{version} # curl-devel (v 7.15.5) was last used in 10.2 Provides: curl-devel <= 7.15.5 Obsoletes: curl-devel < 7.16.2 %description -n libcurl-devel Curl is a client to get documents and files from or send documents to a server using any of the supported protocols (HTTP, HTTPS, FTP, GOPHER, DICT, TELNET, LDAP, or FILE). The command is designed to work without user interaction or any kind of interactivity. %prep %if 0%{?VERIFY_SIG} %gpg_verify %{S:2} %endif %setup -q %patch %patch1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %build autoreconf -fi # local hack to make curl-config --libs stop printing libraries it depends on # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere, # will hopefully change in the future) sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure %configure \ --enable-ipv6 \ %if %{with openssl} --with-ssl \ --with-ca-path=/etc/ssl/certs/ \ %else --without-ssl \ %if %{with mozilla_nss} --with-nss \ %endif %endif --with-gssapi=/usr/lib/mit \ --with-libssh2\ --enable-hidden-symbols \ --disable-static \ --enable-threaded-resolver : if this fails, the above sed hack did not work ./libtool --config | grep -q link_all_deplibs=no # enable-hidden-symbols needs gcc4 and causes that curl exports only its API make %{?_smp_mflags} %if %{with testsuite} %check cd tests make # make sure the testsuite runs don't race on MP machines in autobuild if test -z "$BUILD_INCARNATION" -a -r /.buildenv; then . /.buildenv fi if test -z "$BUILD_INCARNATION"; then BUILD_INCARNATION=0 fi base=$((8990 + $BUILD_INCARNATION * 20)) perl ./runtests.pl -a -b$base || { %if 0%{?curl_testsuite_fatal:1} exit %else echo "WARNING: runtests.pl failed with code $?, continuing nevertheless" %endif } %endif %install %{makeinstall} rm $RPM_BUILD_ROOT%_libdir/libcurl.la install -d $RPM_BUILD_ROOT/usr/share/aclocal install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/ %post -n libcurl4 -p /sbin/ldconfig %postun -n libcurl4 -p /sbin/ldconfig %files %defattr(-,root,root) %doc README RELEASE-NOTES %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting} %doc lib/README.curl_off_t %{_prefix}/bin/curl %doc %{_mandir}/man1/curl.1%{ext_man} %files -n libcurl4 %defattr(-,root,root) %{_libdir}/libcurl.so.4* %files -n libcurl-devel %defattr(-,root,root) %{_prefix}/bin/curl-config %{_prefix}/include/curl %dir %{_prefix}/share/aclocal %{_prefix}/share/aclocal/libcurl.m4 %{_libdir}/libcurl.so %{_libdir}/pkgconfig/libcurl.pc %{_mandir}/man1/curl-config.1%{ext_man} %{_mandir}/man1/mk-ca-bundle.1%{ext_man} %{_mandir}/man3/* %doc docs/libcurl/symbols-in-versions %changelog ++++++ baselibs.conf ++++++ libcurl4 obsoletes "curl-<targettype> <= <version>" provides "curl-<targettype> = <version>" curl-devel requires -curl-<targettype> requires "libcurl4-<targettype> = <version>" ++++++ curl-CVE-2013-0249.patch ++++++ >From ee45a34907ffeb5fd95b0513040d8491d565b663 Mon Sep 17 00:00:00 2001 From: Eldar Zaitov <kyprizel(a)volema.com> Date: Wed, 30 Jan 2013 23:22:27 +0100 Subject: [PATCH] Curl_sasl_create_digest_md5_message: fix buffer overflow When negotiating SASL DIGEST-MD5 authentication, the function Curl_sasl_create_digest_md5_message() uses the data provided from the server without doing the proper length checks and that data is then appended to a local fixed-size buffer on the stack. This vulnerability can be exploited by someone who is in control of a server that a libcurl based program is accessing with POP3, SMTP or IMAP. For applications that accept user provided URLs, it is also thinkable that a malicious user would feed an application with a URL to a server hosting code targetting this flaw. Bug: http://curl.haxx.se/docs/adv_20130206.html --- lib/curl_sasl.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) Index: curl-7.28.1/lib/curl_sasl.c =================================================================== --- curl-7.28.1.orig/lib/curl_sasl.c 2012-08-08 22:45:18.000000000 +0200 +++ curl-7.28.1/lib/curl_sasl.c 2013-02-07 11:55:15.183277599 +0100 @@ -345,9 +345,7 @@ CURLcode Curl_sasl_create_digest_md5_mes snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]); /* Prepare the URL string */ - strcpy(uri, service); - strcat(uri, "/"); - strcat(uri, realm); + snprintf(uri, sizeof(uri), "%s/%s", service, realm); /* Calculate H(A2) */ ctxt = Curl_MD5_init(Curl_DIGEST_MD5); @@ -391,20 +389,11 @@ CURLcode Curl_sasl_create_digest_md5_mes for(i = 0; i < MD5_DIGEST_LEN; i++) snprintf(&resp_hash_hex[2 * i], 3, "%02x", digest[i]); - strcpy(response, "username=\""); - strcat(response, userp); - strcat(response, "\",realm=\""); - strcat(response, realm); - strcat(response, "\",nonce=\""); - strcat(response, nonce); - strcat(response, "\",cnonce=\""); - strcat(response, cnonce); - strcat(response, "\",nc="); - strcat(response, nonceCount); - strcat(response, ",digest-uri=\""); - strcat(response, uri); - strcat(response, "\",response="); - strcat(response, resp_hash_hex); + snprintf(response, sizeof(response), + "username=\"%s\",realm=\"%s\",nonce=\"%s\"," + "cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s", + userp, realm, nonce, + cnonce, nonceCount, uri, resp_hash_hex); /* Base64 encode the reply */ return Curl_base64_encode(data, response, 0, outptr, outlen); ++++++ curl-CVE-2013-1944.patch ++++++ diff --git a/lib/cookie.c b/lib/cookie.c index 35a3731..1aaf669 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -118,15 +118,29 @@ static void freecookie(struct Cookie *co) free(co); } -static bool tailmatch(const char *little, const char *bigone) +static bool tailmatch(const char *cooke_domain, const char *hostname) { - size_t littlelen = strlen(little); - size_t biglen = strlen(bigone); + size_t cookie_domain_len = strlen(cooke_domain); + size_t hostname_len = strlen(hostname); - if(littlelen > biglen) + if(hostname_len < cookie_domain_len) return FALSE; - return Curl_raw_equal(little, bigone+biglen-littlelen) ? TRUE : FALSE; + if(!Curl_raw_equal(cooke_domain, hostname+hostname_len-cookie_domain_len)) + return FALSE; + + /* A lead char of cookie_domain is not '.'. + RFC6265 4.1.2.3. The Domain Attribute says: + For example, if the value of the Domain attribute is + "example.com", the user agent will include the cookie in the Cookie + header when making HTTP requests to example.com, www.example.com, and + www.corp.example.com. + */ + if(hostname_len == cookie_domain_len) + return TRUE; + if('.' == *(hostname + hostname_len - cookie_domain_len - 1)) + return TRUE; + return FALSE; } /* diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 0528a25..b51f524 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -78,6 +78,7 @@ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \ test1126 test1127 test1128 test1129 test1130 test1131 test1132 \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 \ +test1218 \ test1220 \ test1300 test1301 test1302 test1303 test1304 test1305 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ diff --git a/tests/data/test1218 b/tests/data/test1218 new file mode 100644 index 0000000..7d86547 --- /dev/null +++ b/tests/data/test1218 @@ -0,0 +1,61 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP proxy +cookies +</keywords> +</info> + +# This test is very similar to 1216, only that it sets the cookies from the +# first site instead of reading from a file +<reply> +<data> +HTTP/1.1 200 OK +Date: Tue, 25 Sep 2001 19:37:44 GMT +Set-Cookie: domain=.example.fake; bug=fixed; +Content-Length: 21 + +This server says moo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +HTTP cookies and domains with same prefix + </name> + <command> +http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/1218 -b nonexisting -x %HOSTIP:%HTTPPORT +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET http://example.fake/c/1218 HTTP/1.1 +Host: example.fake +Accept: */* +Proxy-Connection: Keep-Alive + +GET http://example.fake/c/1218 HTTP/1.1 +Host: example.fake +Accept: */* +Proxy-Connection: Keep-Alive +Cookie: bug=fixed + +GET http://bexample.fake/c/1218 HTTP/1.1 +Host: bexample.fake +Accept: */* +Proxy-Connection: Keep-Alive + +</protocol> +</verify> +</testcase> ++++++ curl-CVE-2013-2174.patch ++++++ commit 45030219bf8b44270d40fc62e8a02411612d00cc Author: Daniel Stenberg <daniel(a)haxx.se> Date: Sun May 19 23:24:29 2013 +0200 Curl_urldecode: no peaking beyond end of input buffer Security problem: .... If a program would give a string like "%" to curl_easy_unescape(), it would still consider the % as start of an encoded character. The function then not only read beyond the buffer but it would also deduct the *unsigned* counter variable for how many more bytes there's left to read in the buffer by two, making the counter wrap. Continuing this, the function would go on reading beyond the buffer and soon writing beyond the allocated target buffer... Reported-by: Timo Sirainen Index: curl-7.19.0/lib/escape.c =================================================================== --- curl-7.19.0.orig/lib/escape.c 2013-06-13 12:17:06.251345362 +0200 +++ curl-7.19.0/lib/escape.c 2013-06-13 12:17:07.228374970 +0200 @@ -149,7 +149,8 @@ char *curl_easy_unescape(CURL *handle, c while(--alloc > 0) { in = *string; - if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) { + if(('%' == in) && (alloc > 2) && + ISXDIGIT(string[1]) && ISXDIGIT(string[2])) { /* this is two hexadecimal digits following a '%' */ char hexstr[3]; char *ptr; ++++++ curl-CVE-2013-4545.patch ++++++ commit 3c3622b66221d89509cffaa693fc7dcd5c5b96cf Author: Daniel Stenberg <daniel(a)haxx.se> Date: Wed Oct 2 15:31:10 2013 +0200 OpenSSL: acknowledge CURLOPT_SSL_VERIFYHOST without VERIFYPEER Setting only CURLOPT_SSL_VERIFYHOST without CURLOPT_SSL_VERIFYPEER set should still verify that the host name fields in the server certificate is fine or return failure. Bug: http://curl.haxx.se/mail/lib-2013-10/0002.html Reported-by: Ishan SinghLevett diff --git a/lib/ssluse.c b/lib/ssluse.c index 4f3c1e1..9974ac8 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -2351,7 +2351,7 @@ ossl_connect_step3(struct connectdata *conn, * operations. */ - if(!data->set.ssl.verifypeer) + if(!data->set.ssl.verifypeer && !data->set.ssl.verifyhost) (void)servercert(conn, connssl, FALSE); else retcode = servercert(conn, connssl, TRUE); ++++++ curl-CVE-2014-0015-NTLM_connection_reuse.patch ++++++ commit 8ae35102c43d8d06572c3a1292eb6e27e663c78d Author: Daniel Stenberg <daniel(a)haxx.se> Date: Tue Jan 7 09:33:54 2014 +0100 ConnectionExists: fix NTLM check for new connection When the requested authentication bitmask includes NTLM, we cannot re-use a connection for another username/password as we then risk re-using NTLM (connection-based auth). This has the unfortunate downside that if you include NTLM as a possible auth, you cannot re-use connections for other usernames/passwords even if NTLM doesn't end up the auth type used. Reported-by: Paras S Patched-by: Paras S Bug: http://curl.haxx.se/mail/lib-2014-01/0046.html Index: curl-7.28.1/lib/url.c =================================================================== --- curl-7.28.1.orig/lib/url.c 2014-01-14 14:35:12.627855282 +0100 +++ curl-7.28.1/lib/url.c 2014-01-14 14:35:52.164309737 +0100 @@ -2942,8 +2942,8 @@ ConnectionExists(struct SessionHandle *d struct connectdata *check; struct connectdata *chosen = 0; bool canPipeline = IsPipeliningPossible(data, needle); - bool wantNTLM = (data->state.authhost.want==CURLAUTH_NTLM) || - (data->state.authhost.want==CURLAUTH_NTLM_WB); + bool wantNTLM = (data->state.authhost.want & CURLAUTH_NTLM) || + (data->state.authhost.want & CURLAUTH_NTLM_WB); for(i=0; i< data->state.connc->num; i++) { bool match = FALSE; ++++++ curl-CVE-2014-0138.patch ++++++ >From 9db36827fb5eade403143b36566914ee9dc37d7b Mon Sep 17 00:00:00 2001 From: Steve Holme <steve_holme(a)hotmail.com> Date: Thu, 20 Feb 2014 23:51:36 +0000 Subject: [PATCH] url: Fixed connection re-use when using different log-in credentials In addition to FTP, other connection based protocols such as IMAP, POP3, SMTP, SCP, SFTP and LDAP require a new connection when different log-in credentials are specified. Fixed the detection logic to include these other protocols. Bug: http://curl.haxx.se/docs/adv_20140326A.html --- lib/http.c | 2 +- lib/url.c | 7 ++++--- lib/urldata.h | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) Index: curl-7.28.1/lib/http.c =================================================================== --- curl-7.28.1.orig/lib/http.c 2014-04-10 13:48:24.391462756 +0200 +++ curl-7.28.1/lib/http.c 2014-04-10 13:48:26.799485773 +0200 @@ -148,7 +148,7 @@ const struct Curl_handler Curl_handler_h ZERO_NULL, /* readwrite */ PORT_HTTPS, /* defport */ CURLPROTO_HTTP | CURLPROTO_HTTPS, /* protocol */ - PROTOPT_SSL /* flags */ + PROTOPT_SSL | PROTOPT_CREDSPERREQUEST /* flags */ }; #endif Index: curl-7.28.1/lib/url.c =================================================================== --- curl-7.28.1.orig/lib/url.c 2014-04-10 13:48:26.800485782 +0200 +++ curl-7.28.1/lib/url.c 2014-04-10 13:50:40.772766689 +0200 @@ -3117,10 +3117,10 @@ ConnectionExists(struct SessionHandle *d continue; } } - if((needle->handler->protocol & CURLPROTO_FTP) || - ((needle->handler->protocol & CURLPROTO_HTTP) && wantNTLM)) { - /* This is FTP or HTTP+NTLM, verify that we're using the same name - and password as well */ + if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) || + ((needle->handler->protocol & CURLPROTO_HTTP) && wantNTLM)) { + /* This protocol requires credentials per connection or is HTTP+NTLM, + so verify that we're using the same name and password as well */ if(!strequal(needle->user, check->user) || !strequal(needle->passwd, check->passwd)) { /* one of them was different */ Index: curl-7.28.1/lib/urldata.h =================================================================== --- curl-7.28.1.orig/lib/urldata.h 2014-04-10 13:48:24.392462766 +0200 +++ curl-7.28.1/lib/urldata.h 2014-04-10 13:48:26.801485792 +0200 @@ -755,6 +755,8 @@ struct Curl_handler { gets a default */ #define PROTOPT_NOURLQUERY (1<<6) /* protocol can't handle url query strings (?foo=bar) ! */ +#define PROTOPT_CREDSPERREQUEST (1<<7) /* requires login creditials per request + as opposed to per connection */ /* return the count of bytes sent, or -1 on error */ ++++++ curl-CVE-2014-0139.patch ++++++ >From f44e3a4d0df9397278735d1520f7681715b83b59 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel(a)haxx.se> Date: Mon, 3 Mar 2014 11:46:36 +0100 Subject: [PATCH] Curl_cert_hostcheck: reject IP address wildcard matches There are server certificates used with IP address in the CN field, but we MUST not allow wild cart certs for hostnames given as IP addresses only. Therefore we must make Curl_cert_hostcheck() fail such attempts. Bug: http://curl.haxx.se/docs/adv_20140326B.html Reported-by: Richard Moore --- lib/hostcheck.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/hostcheck.c b/lib/hostcheck.c index 24ddd89..d144f31 100644 --- a/lib/hostcheck.c +++ b/lib/hostcheck.c @@ -28,6 +28,7 @@ #include "hostcheck.h" #include "rawstr.h" +#include "inet_pton.h" /* * Match a hostname against a wildcard pattern. @@ -43,11 +44,23 @@ static int hostmatch(const char *hostname, const char *pattern) const char *pattern_label_end, *pattern_wildcard, *hostname_label_end; int wildcard_enabled; size_t prefixlen, suffixlen; + struct in_addr ignored; +#ifdef ENABLE_IPV6 + struct sockaddr_in6 si6; +#endif pattern_wildcard = strchr(pattern, '*'); if(pattern_wildcard == NULL) return Curl_raw_equal(pattern, hostname) ? CURL_HOST_MATCH : CURL_HOST_NOMATCH; + /* detect IP address as hostname and fail the match if so */ + if(Curl_inet_pton(AF_INET, hostname, &ignored) > 0) + return CURL_HOST_NOMATCH; +#ifdef ENABLE_IPV6 + else if(Curl_inet_pton(AF_INET6, hostname, &si6.sin6_addr) > 0) + return CURL_HOST_NOMATCH; +#endif + /* We require at least 2 dots in pattern to avoid too wide wildcard match. */ wildcard_enabled = 1; -- 1.9.0 ++++++ curl-CVE-2014-3613.patch ++++++ >From eac573ea9c368f5e3c07de4d5ec5c5d0f84a021a Mon Sep 17 00:00:00 2001 From: Tim Ruehsen <tim.ruehsen(a)gmx.de> Date: Tue, 19 Aug 2014 21:01:28 +0200 Subject: [PATCH 1/2] cookies: only use full host matches for hosts used as IP address By not detecting and rejecting domain names for partial literal IP addresses properly when parsing received HTTP cookies, libcurl can be fooled to both send cookies to wrong sites and to allow arbitrary sites to set cookies for others. Bug: http://curl.haxx.se/docs/adv_20140910.html --- lib/cookie.c | 50 ++++++++++++++++++++++++++++++++++++++---------- tests/data/test1105 | 3 +-- tests/data/test31 | 55 +++++++++++++++++++++++++++-------------------------- tests/data/test8 | 3 ++- 4 files changed, 71 insertions(+), 40 deletions(-) Index: curl-7.28.1/lib/cookie.c =================================================================== --- curl-7.28.1.orig/lib/cookie.c 2014-09-10 15:47:19.149052494 +0200 +++ curl-7.28.1/lib/cookie.c 2014-09-10 15:47:19.191053031 +0200 @@ -94,6 +94,7 @@ Example set of cookies: #include "strtoofft.h" #include "rawstr.h" #include "curl_memrchr.h" +#include "inet_pton.h" /* The last #include file should be: */ #include "memdebug.h" @@ -177,6 +178,27 @@ static void strstore(char **str, const c *str = strdup(newstr); } +/* + * Return true if the given string is an IP(v4|v6) address. + */ +static bool isip(const char *domain) +{ + struct in_addr addr; +#ifdef ENABLE_IPV6 + struct in6_addr addr6; +#endif + + if(Curl_inet_pton(AF_INET, domain, &addr) +#ifdef ENABLE_IPV6 + || Curl_inet_pton(AF_INET6, domain, &addr6) +#endif + ) { + /* domain name given as IP address */ + return TRUE; + } + + return FALSE; +} /**************************************************************************** * @@ -290,6 +312,8 @@ Curl_cookie_add(struct SessionHandle *da } } else if(Curl_raw_equal("domain", name)) { + bool is_ip; + const char *dotp; /* note that this name may or may not have a preceding dot, but we don't care about that, we treat the names the same anyway */ @@ -333,16 +357,22 @@ Curl_cookie_add(struct SessionHandle *da if('.' == whatptr[0]) whatptr++; /* ignore preceding dot */ - if(!domain || tailmatch(whatptr, domain)) { - const char *tailptr=whatptr; - if(tailptr[0] == '.') - tailptr++; - strstore(&co->domain, tailptr); /* don't prefix w/dots - internally */ + is_ip = isip(domain ? domain : whatptr); + + /* check for more dots */ + dotp = strchr(whatptr, '.'); + if(!dotp) + domain=":"; + + if(!domain + || (is_ip && !strcmp(whatptr, domain)) + || (!is_ip && tailmatch(whatptr, domain))) { + strstore(&co->domain, whatptr); if(!co->domain) { badcookie = TRUE; break; } + if(!is_ip) co->tailmatch=TRUE; /* we always do that if the domain name was given */ } @@ -819,10 +849,14 @@ struct Cookie *Curl_cookie_getlist(struc time_t now = time(NULL); struct Cookie *mainco=NULL; size_t matches = 0; + bool is_ip; if(!c || !c->cookies) return NULL; /* no cookie struct or no cookies in the struct */ + /* check if host is an IP(v4|v6) address */ + is_ip = isip(host); + co = c->cookies; while(co) { @@ -834,8 +868,8 @@ struct Cookie *Curl_cookie_getlist(struc /* now check if the domain is correct */ if(!co->domain || - (co->tailmatch && tailmatch(co->domain, host)) || - (!co->tailmatch && Curl_raw_equal(host, co->domain)) ) { + (co->tailmatch && !is_ip && tailmatch(co->domain, host)) || + ((!co->tailmatch || is_ip) && Curl_raw_equal(host, co->domain)) ) { /* the right part of the host matches the domain stuff in the cookie data */ Index: curl-7.28.1/tests/data/test1105 =================================================================== --- curl-7.28.1.orig/tests/data/test1105 2012-11-19 11:49:15.000000000 +0100 +++ curl-7.28.1/tests/data/test1105 2014-09-10 15:47:19.192053044 +0200 @@ -59,8 +59,7 @@ userid=myname&password=mypassword # This file was generated by libcurl! Edit at your own risk. 127.0.0.1 FALSE /we/want/ FALSE 0 foobar name -.127.0.0.1 TRUE "/silly/" FALSE 0 mismatch this -.0.0.1 TRUE / FALSE 0 partmatch present +127.0.0.1 FALSE "/silly/" FALSE 0 mismatch this </file> </verify> </testcase> Index: curl-7.28.1/tests/data/test31 =================================================================== --- curl-7.28.1.orig/tests/data/test31 2012-11-19 11:49:15.000000000 +0100 +++ curl-7.28.1/tests/data/test31 2014-09-10 15:53:38.164885768 +0200 @@ -49,7 +49,8 @@ Set-Cookie: novalue; domain=reallysilly Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030 Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030 Set-Cookie: magic=yessir; path=/silly/; HttpOnly -Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad; +Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad; +Set-Cookie: partialip=nono; domain=.0.0.1; boo </data> @@ -93,30 +94,30 @@ Accept: */* # http://curl.haxx.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. -.127.0.0.1 TRUE /silly/ FALSE 0 ismatch this -.127.0.0.1 TRUE /secure1/ TRUE 0 sec1value secure1 -.127.0.0.1 TRUE /secure2/ TRUE 0 sec2value secure2 -.127.0.0.1 TRUE /secure3/ TRUE 0 sec3value secure3 -.127.0.0.1 TRUE /secure4/ TRUE 0 sec4value secure4 -.127.0.0.1 TRUE /secure5/ TRUE 0 sec5value secure5 -.127.0.0.1 TRUE /secure6/ TRUE 0 sec6value secure6 -.127.0.0.1 TRUE /secure7/ TRUE 0 sec7value secure7 -.127.0.0.1 TRUE /secure8/ TRUE 0 sec8value secure8 -.127.0.0.1 TRUE /secure9/ TRUE 0 secure very1 -#HttpOnly_.127.0.0.1 TRUE /p1/ FALSE 0 httpo1 value1 -#HttpOnly_.127.0.0.1 TRUE /p2/ FALSE 0 httpo2 value2 -#HttpOnly_.127.0.0.1 TRUE /p3/ FALSE 0 httpo3 value3 -#HttpOnly_.127.0.0.1 TRUE /p4/ FALSE 0 httpo4 value4 -#HttpOnly_.127.0.0.1 TRUE /p4/ FALSE 0 httponly myvalue1 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec myvalue2 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec2 myvalue3 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec3 myvalue4 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec4 myvalue5 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec5 myvalue6 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec6 myvalue7 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec7 myvalue8 -#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec8 myvalue9 -.127.0.0.1 TRUE / FALSE 0 partmatch present +127.0.0.1 TRUE /silly/ FALSE 0 ismatch this +127.0.0.1 TRUE /secure1/ TRUE 0 sec1value secure1 +127.0.0.1 TRUE /secure2/ TRUE 0 sec2value secure2 +127.0.0.1 TRUE /secure3/ TRUE 0 sec3value secure3 +127.0.0.1 TRUE /secure4/ TRUE 0 sec4value secure4 +127.0.0.1 TRUE /secure5/ TRUE 0 sec5value secure5 +127.0.0.1 TRUE /secure6/ TRUE 0 sec6value secure6 +127.0.0.1 TRUE /secure7/ TRUE 0 sec7value secure7 +127.0.0.1 TRUE /secure8/ TRUE 0 sec8value secure8 +127.0.0.1 TRUE /secure9/ TRUE 0 secure very1 +#HttpOnly_127.0.0.1 TRUE /p1/ FALSE 0 httpo1 value1 +#HttpOnly_127.0.0.1 TRUE /p2/ FALSE 0 httpo2 value2 +#HttpOnly_127.0.0.1 TRUE /p3/ FALSE 0 httpo3 value3 +#HttpOnly_127.0.0.1 TRUE /p4/ FALSE 0 httpo4 value4 +#HttpOnly_127.0.0.1 TRUE /p4/ FALSE 0 httponly myvalue1 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec myvalue2 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec2 myvalue3 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec3 myvalue4 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec4 myvalue5 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec5 myvalue6 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec6 myvalue7 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec7 myvalue8 +#HttpOnly_127.0.0.1 TRUE /p4/ TRUE 0 httpandsec8 myvalue9 +127.0.0.1 FALSE / FALSE 0 partmatch present 127.0.0.1 FALSE /we/want/ FALSE 2054030187 nodomain value #HttpOnly_127.0.0.1 FALSE /silly/ FALSE 0 magic yessir .0.0.1 TRUE /we/want/ FALSE 0 blexp yesyes Index: curl-7.28.1/tests/data/test8 =================================================================== --- curl-7.28.1.orig/tests/data/test8 2012-11-19 11:49:15.000000000 +0100 +++ curl-7.28.1/tests/data/test8 2014-09-10 15:47:19.192053044 +0200 @@ -42,7 +42,8 @@ Set-Cookie: duplicate=test; domain=.0.0. Set-Cookie: cookie=yes; path=/we; Set-Cookie: cookie=perhaps; path=/we/want; Set-Cookie: nocookie=yes; path=/WE; -Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad; +Set-Cookie: blexp=yesyes; domain=%HOSTIP; domain=%HOSTIP; expiry=totally bad; +Set-Cookie: partialip=nono; domain=.0.0.1; </file> <precheck> @@ -59,7 +60,7 @@ perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) GET /we/want/8 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* -Cookie: cookie=perhaps; cookie=yes; partmatch=present; foobar=name; blexp=yesyes +Cookie: cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes </protocol> </verify> Index: curl-7.28.1/tests/data/test61 =================================================================== --- curl-7.28.1.orig/tests/data/test61 2012-08-08 23:38:25.000000000 +0200 +++ curl-7.28.1/tests/data/test61 2014-09-10 15:47:19.192053044 +0200 @@ -23,6 +23,7 @@ Set-Cookie: test3=maybe; domain=foo.com; Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure Set-Cookie: test5=name; domain=anything.com; path=/ ; secure Set-Cookie: fake=fooledyou; domain=..com; path=/; +Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M Content-Length: 4 boo ++++++ curl-test172_cookie_expiration.patch ++++++ Index: curl-7.19.7/tests/data/test172 =================================================================== --- curl-7.19.7.orig/tests/data/test172 2008-11-19 22:12:35.000000000 +0100 +++ curl-7.19.7/tests/data/test172 2014-02-04 15:05:46.817554144 +0100 @@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b .%HOSTIP TRUE /silly/ FALSE 0 ismatch this .%HOSTIP TRUE / FALSE 0 partmatch present -%HOSTIP FALSE /we/want/ FALSE 1391252187 nodomain value +%HOSTIP FALSE /we/want/ FALSE 2139150993 nodomain value </file> </client> ++++++ curl.keyring ++++++ pub 1024D/279D5C91 2003-04-28 uid Daniel Stenberg (Haxx) <daniel(a)haxx.se> sub 1024g/B70B3510 2003-04-28 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD6tnnoRBACRPnFBVoapBrTpPrCNZ2rq3DcmW6n/soQJW47+zP+vcrcxQ1WJ QiWSzLGO+QOIUZSYfnliR22r8HkFX9EUSW3IAcRMJMsaO3wMJ0a+78a9QqWLp6RV 0arcQkuuCvG79h+yJ6NnoAXe1geRt8vNGsaWtsS91CtYlTSs6JVtaRLnYwCg/Ly1 EFgvNZ6SJRc/8I5rRv0lrz8D/0goih2kZ5z4SI+r2hgABNcN7g565YwGKaQDbIch soh3OBzgETWc3wuAZqmCzQXPXMpMx+ziqX6XDzDKNiGL1CdrBJQd0II8UutWVDje f9UxLfo02YQ8diGYeq0u9k1RezC13w4TVUmQfg0Uqn4xM6DNzO1O6yCK8rlNwsvL gHNJA/9m1pfzjpvdxtmJNKRU3C4cRCjXhxNdM7laSEj0/wOGaR2QWWEge51orWwo SLQUIe4BDPvtRStQHC+tI7qr7d12rMMEBXviJC5EkGBOzlgWr9virjM/u/pkGMc2 m5r3pVuWH/JSsHsV952y2kWP64uP4zdLXOpVzX/xs0sYJ9nOPLQnRGFuaWVsIFN0 ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iFkEExECABkFAj6tnnoECwcD AgMVAgMDFgIBAh4BAheAAAoJEHjhHGsnnVyRjngAn1gK6Q0qUTHwYJBAhIDmrRi0 ebfDAJ4qDSHd6UU2MEkkFCgGfYgEBXKbb7kBDQQ+rZ59EAQAmYsA8gPjJ75gOIPb XNg9Z31QzIz65qS9XdNsFNAdKxnY4b72nhc0oaS9/7Dcdf2Q+1mDa2p72DWk+9iz 7knmBL++csBP2z9eMe5h8oV53prqNOHDHyL3WLOa25ga9381gZnzWoQME74iSBBM wDw8vbLEgIZ34JaQ7Oe+9N3+6n8AAwcD/Av+Ms+3gCc5pLp4nx36qqi36fodaG9+ dwIcMbr9bivEtjmDHeuPsD6X1J9+Y/ikUBIDpMPv33lJxLoubOtpLhEuN2XN/ojT rueVPDKA1f+GyfHnyfpf/78IgX1hGVqu/3RBWKPpXFwSZA4q8vFR+FaPC5WbU68t FLJpYuC9ZO/LiEYEGBECAAYFAj6tnn0ACgkQeOEcayedXJGtPQCgxrbd59afemZ9 OIadZD8kUGC29dUAoJ94aGUkWCwoEiPyEZRGXv9XRlfx =yTQx -----END PGP PUBLIC KEY BLOCK----- ++++++ dont-mess-with-rpmoptflags.diff ++++++ Index: configure.ac =================================================================== --- configure.ac.orig 2013-02-07 11:55:15.150276599 +0100 +++ configure.ac 2013-02-07 11:55:15.167277116 +0100 @@ -288,10 +288,6 @@ dnl platform/compiler/architecture speci dnl ********************************************************************** CURL_CHECK_COMPILER -CURL_SET_COMPILER_BASIC_OPTS -CURL_SET_COMPILER_DEBUG_OPTS -CURL_SET_COMPILER_OPTIMIZE_OPTS -CURL_SET_COMPILER_WARNING_OPTS if test "$compiler_id" = "INTEL_UNIX_C"; then # ++++++ libcurl-ocloexec.patch ++++++ Open library file descriptors with O_CLOEXEC This patch is non-portable, it needs linux 2.6.23 and glibc 2.7 or later, different combinations (old linux, new glibc and vice-versa) will result in a crash. To make it portable you have to test O_CLOEXEC support at *runtime* compile time is not enough. Index: lib/cookie.c =================================================================== --- lib/cookie.c.orig 2012-08-08 23:38:25.000000000 +0200 +++ lib/cookie.c 2013-02-07 11:55:15.146276477 +0100 @@ -736,7 +736,7 @@ struct CookieInfo *Curl_cookie_init(stru fp = NULL; } else - fp = file?fopen(file, "r"):NULL; + fp = file?fopen(file, "re"):NULL; c->newsession = newsession; /* new session? */ @@ -1060,7 +1060,7 @@ static int cookie_output(struct CookieIn use_stdout=TRUE; } else { - out = fopen(dumphere, "w"); + out = fopen(dumphere, "we"); if(!out) return 1; /* failure */ } Index: lib/file.c =================================================================== --- lib/file.c.orig 2012-11-13 22:04:27.000000000 +0100 +++ lib/file.c 2013-02-07 11:55:15.147276507 +0100 @@ -249,7 +249,7 @@ static CURLcode file_connect(struct conn fd = open_readonly(actual_path, O_RDONLY|O_BINARY); file->path = actual_path; #else - fd = open_readonly(real_path, O_RDONLY); + fd = open_readonly(real_path, O_RDONLY|O_CLOEXEC); file->path = real_path; #endif file->freepath = real_path; /* free this when done */ @@ -347,7 +347,7 @@ static CURLcode file_upload(struct conne else mode = MODE_DEFAULT|O_TRUNC; - fd = open(file->path, mode, conn->data->set.new_file_perms); + fd = open(file->path, mode | O_CLOEXEC, conn->data->set.new_file_perms); if(fd < 0) { failf(data, "Can't open %s for writing", file->path); return CURLE_WRITE_ERROR; Index: lib/formdata.c =================================================================== --- lib/formdata.c.orig 2012-08-08 22:45:18.000000000 +0200 +++ lib/formdata.c 2013-02-07 11:55:15.147276507 +0100 @@ -1207,7 +1207,7 @@ CURLcode Curl_getformdata(struct Session FILE *fileread; fileread = strequal("-", file->contents)? - stdin:fopen(file->contents, "rb"); /* binary read for win32 */ + stdin:fopen(file->contents, "rbe"); /* binary read for win32 */ /* * VMS: This only allows for stream files on VMS. Stream files are @@ -1338,7 +1338,7 @@ static size_t readfromfile(struct Form * else { if(!form->fp) { /* this file hasn't yet been opened */ - form->fp = fopen(form->data->line, "rb"); /* b is for binary */ + form->fp = fopen(form->data->line, "rbe"); /* b is for binary */ if(!form->fp) return (size_t)-1; /* failure */ } Index: lib/hostip6.c =================================================================== --- lib/hostip6.c.orig 2012-03-08 20:35:24.000000000 +0100 +++ lib/hostip6.c 2013-02-07 11:55:15.147276507 +0100 @@ -45,7 +45,7 @@ #ifdef HAVE_PROCESS_H #include <process.h> #endif - +#include <fcntl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" @@ -113,7 +113,7 @@ bool Curl_ipv6works(void) static int ipv6_works = -1; if(-1 == ipv6_works) { /* probe to see if we have a working IPv6 stack */ - curl_socket_t s = socket(PF_INET6, SOCK_DGRAM, 0); + curl_socket_t s = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); if(s == CURL_SOCKET_BAD) /* an ipv6 address was requested but we can't get/use one */ ipv6_works = 0; Index: lib/if2ip.c =================================================================== --- lib/if2ip.c.orig 2012-03-08 20:35:24.000000000 +0100 +++ lib/if2ip.c 2013-02-07 11:55:15.148276537 +0100 @@ -153,7 +153,7 @@ char *Curl_if2ip(int af, const char *int if(len >= sizeof(req.ifr_name)) return NULL; - dummy = socket(AF_INET, SOCK_STREAM, 0); + dummy = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); if(CURL_SOCKET_BAD == dummy) return NULL; Index: lib/netrc.c =================================================================== --- lib/netrc.c.orig 2012-08-08 22:45:18.000000000 +0200 +++ lib/netrc.c 2013-02-07 11:55:15.148276537 +0100 @@ -107,7 +107,7 @@ int Curl_parsenetrc(const char *host, netrc_alloc = TRUE; } - file = fopen(netrcfile, "r"); + file = fopen(netrcfile, "re"); if(file) { char *tok; char *tok_buf; Index: lib/ssluse.c =================================================================== --- lib/ssluse.c.orig 2012-11-13 23:01:17.000000000 +0100 +++ lib/ssluse.c 2013-02-07 11:55:15.149276568 +0100 @@ -437,7 +437,7 @@ int cert_stuff(struct connectdata *conn, STACK_OF(X509) *ca = NULL; int i; - f = fopen(cert_file,"rb"); + f = fopen(cert_file,"rbe"); if(!f) { failf(data, "could not open PKCS12 file '%s'", cert_file); return 0; @@ -2274,7 +2274,7 @@ static CURLcode servercert(struct connec /* e.g. match issuer name with provided issuer certificate */ if(data->set.str[STRING_SSL_ISSUERCERT]) { - fp=fopen(data->set.str[STRING_SSL_ISSUERCERT],"r"); + fp=fopen(data->set.str[STRING_SSL_ISSUERCERT],"re"); if(!fp) { if(strict) failf(data, "SSL: Unable to open issuer cert (%s)", Index: lib/connect.c =================================================================== --- lib/connect.c.orig 2012-11-13 22:02:15.000000000 +0100 +++ lib/connect.c 2013-02-07 11:55:15.149276568 +0100 @@ -1238,7 +1238,7 @@ CURLcode Curl_socket(struct connectdata (struct curl_sockaddr *)addr); else /* opensocket callback not set, so simply create the socket now */ - *sockfd = socket(addr->family, addr->socktype, addr->protocol); + *sockfd = socket(addr->family, addr->socktype | SOCK_CLOEXEC, addr->protocol); if(*sockfd == CURL_SOCKET_BAD) /* no socket, no connection */ Index: configure.ac =================================================================== --- configure.ac.orig 2012-09-08 22:39:18.000000000 +0200 +++ configure.ac 2013-02-07 11:58:27.875122101 +0100 @@ -180,6 +180,7 @@ AC_CANONICAL_HOST dnl Get system canonical name AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS]) +AC_USE_SYSTEM_EXTENSIONS dnl Checks for programs. CURL_CHECK_PROG_CC @@ -193,6 +194,7 @@ dnl Our configure and build reentrant se CURL_CONFIGURE_THREAD_SAFE CURL_CONFIGURE_REENTRANT + dnl check for how to do large files AC_SYS_LARGEFILE Index: m4/curl-compilers.m4 =================================================================== --- m4/curl-compilers.m4.orig 2012-11-16 13:02:23.000000000 +0100 +++ m4/curl-compilers.m4 2013-02-07 11:55:15.151276630 +0100 @@ -1272,7 +1272,7 @@ dnl CPPFLAGS from being unexpectedly cha AC_DEFUN([CURL_CHECK_PROG_CC], [ ac_save_CFLAGS="$CFLAGS" ac_save_CPPFLAGS="$CPPFLAGS" - AC_PROG_CC + AC_PROG_CC_STDC CFLAGS="$ac_save_CFLAGS" CPPFLAGS="$ac_save_CPPFLAGS" ]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit amanda for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at 2014-09-17 21:24:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amanda (Old) and /work/SRC/openSUSE:Factory/.amanda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amanda" Changes: -------- --- /work/SRC/openSUSE:Factory/amanda/amanda.changes 2014-07-21 22:35:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amanda.new/amanda.changes 2014-09-17 21:25:16.000000000 +0200 @@ -1,0 +2,42 @@ +Tue Sep 16 20:21:58 UTC 2014 - darin(a)darins.net + +- wrap %post permissions routines in conditionals for SLES + +------------------------------------------------------------------- +Mon Sep 15 16:15:42 UTC 2014 - darin(a)darins.net + +- update to 3.3.6 + * ambsdtar + new application that use BSD tar to do the backup. + + 3.3.5 release notes + * faster 'verify' command. + fix parsing of config override arguments. + * amsamba + Add REGEX-MATCH property. + * amvault + Print progress status. + * ndmp device + INDIRECT property default to yes. + + 3.3.4 release notes + * amreport + new --format argument + new 'json' and 'json_raw' format. + * amanda.conf + new REPORT-FORMAT option. + * amtape + new 'verify' command. + * amadmin + new 'force-level-1' command. + * ampgsql + Add VERBOSE property. + * S3 device + handle DURABLE_REDUCED_AVAILABILITY for google storage. + + See ChangeLog for a full listing of changes: + /usr/share/doc/packages/amanda/ChangeLog + +- removed amanda-gets.patch, applied upstream + +------------------------------------------------------------------- Old: ---- amanda-3.3.3.tar.bz2 amanda-gets.patch New: ---- amanda-3.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.qcMzQk/_old 2014-09-17 21:25:18.000000000 +0200 +++ /var/tmp/diff_new_pack.qcMzQk/_new 2014-09-17 21:25:18.000000000 +0200 @@ -24,7 +24,7 @@ %endif Name: amanda -Version: 3.3.3 +Version: 3.3.6 Release: 0 PreReq: pwdutils permissions @@ -57,7 +57,7 @@ License: GPL-3.0+ Group: Productivity/Archiving/Backup -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz #amanda-SuSE.tar.bz2 contain init scripts, config examples Source1: %{name}-SuSE.tar.bz2 Source2: amanda-howto-collection.pdf.tar.bz2 @@ -65,7 +65,6 @@ Patch3: amanda-2.6.1p1-shellbang.patch Patch4: amanda-2.6.1p1-return_val.patch Patch6: amanda-2.6.1p1-avoid-perl-provides.patch -Patch8: amanda-gets.patch Patch9: amanda-3.3.2-returnvalues.patch Patch10: amanda-automake_add_missing.patch Patch11: amanda-3.3.3-noundefbool.patch @@ -82,7 +81,6 @@ %patch3 %patch4 %patch6 -p1 -%patch8 -p1 %patch9 -p1 %patch10 %patch11 @@ -176,9 +174,16 @@ %endif %post +%if 0%{?set_permissions:1} %set_permissions /usr/sbin/amcheck /usr/lib/amanda/calcsize /usr/lib/amanda/rundump /usr/lib/amanda/planner /usr/lib/amanda/runtar /usr/lib/amanda/dumper /usr/lib/amanda/killpgrp +%else +%run_permissions +%endif + +%if 0%{?suse_version} >= 1120 %verifyscript %verify_permissions -f /usr/lib/amanda/suidlist +%endif %files %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit genius for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package genius for openSUSE:Factory checked in at 2014-09-17 21:24:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/genius (Old) and /work/SRC/openSUSE:Factory/.genius.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "genius" Changes: -------- --- /work/SRC/openSUSE:Factory/genius/genius.changes 2013-06-29 19:39:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.genius.new/genius.changes 2014-09-17 21:25:13.000000000 +0200 @@ -1,0 +2,28 @@ +Sat Sep 13 07:58:00 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.0.18: + + New general functions: KroneckerProduct (alias TensorProduct), + NewtonsMethod, HalleysMethod, LambertW, LambertWm1, + NonzeroColumns, NonzeroElements, DisplayVariables, PrintTable, + SetElement, SetVElement. + + New plotting functions: PlotCanvasFreeze/PlotCanvasThaw to + improve flicker if doing animations with genius, and + LinePlotDrawPoints function to draw just points without the + line. While plotting errors are no longer forced into a dialog, + and presence of errors is indicated in the graph window below + the graph. + + Allow setting color in LinePlotDrawLine with RGB vector. When + the vector building notation is done with floats and the final + number is within 2^-20 times the step size of the goal, assume + there were roundoff errors and still add it, just like for + loops, so something like 1.0:0.1:3.0 now works. + + Implement subsecond precision in wait function. + + Fix memory corruption error triggered in nested floating point + for loops with a floating point step. + + Few minor bug fixes and fix some more compile warnings in + gtkextra. + + Streamline the compiled file format (saves about 30kb). + + A few improvements to the documentation. + + Updated translations. + +------------------------------------------------------------------- Old: ---- genius-1.0.17.tar.xz New: ---- genius-1.0.18.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ genius.spec ++++++ --- /var/tmp/diff_new_pack.1wa0qP/_old 2014-09-17 21:25:15.000000000 +0200 +++ /var/tmp/diff_new_pack.1wa0qP/_new 2014-09-17 21:25:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package genius # -# Copyright (c) 2013 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 @@ -17,7 +17,7 @@ Name: genius -Version: 1.0.17 +Version: 1.0.18 Release: 0 Summary: General purpose calculator and mathematics tool License: GPL-3.0+ ++++++ genius-1.0.17.tar.xz -> genius-1.0.18.tar.xz ++++++ ++++ 157859 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nodejs for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package nodejs for openSUSE:Factory checked in at 2014-09-17 21:24:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs (Old) and /work/SRC/openSUSE:Factory/.nodejs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs/nodejs.changes 2014-08-25 11:06:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs.new/nodejs.changes 2014-09-17 21:25:10.000000000 +0200 @@ -1,0 +2,23 @@ +Wed Sep 17 06:28:02 UTC 2014 - i(a)marguerite.su + +- update version 0.10.32 + * v8: fix a crash introduced by previous release + * configure: add --openssl-no-asm flag + * crypto: use domains for any callback-taking method + * http: do not send `0\r\n\r\n` in TE HEAD responses + * querystring: fix unescape override + * url: Add support for RFC 3490 separators + +------------------------------------------------------------------- +Wed Sep 10 12:14:13 UTC 2014 - jgleissner(a)suse.com + +- do not install NPM +- use /usr/lib/node_modules instead of /usr/lib64/node_modules even + on x86_64 (node modules are not binary) +- drop patch: nodejs-lib64path.patch and nodejs-libpath.patch + * installing in /usr/lib64 doesn't really make sense for non-binary files +- drop patch: node-gyp-addon-gypi.patch and + nodejs-add_missing_shebang_to_read-package-json.patch + * they were patching npm files, which is separate now + +------------------------------------------------------------------- Old: ---- node-gyp-addon-gypi.patch node-v0.10.31.tar.gz nodejs-add_missing_shebang_to_read-package-json.patch nodejs-lib64path.patch nodejs-libpath.patch New: ---- node-v0.10.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs.spec ++++++ --- /var/tmp/diff_new_pack.Xj72Cw/_old 2014-09-17 21:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Xj72Cw/_new 2014-09-17 21:25:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: nodejs -Version: 0.10.31 +Version: 0.10.32 Release: 0 Summary: Evented I/O for V8 JavaScript License: MIT @@ -25,11 +25,7 @@ Url: http://www.nodejs.org Source: http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz Source1: macros.nodejs -Patch0: nodejs-lib64path.patch -Patch2: nodejs-libpath.patch -Patch4: node-gyp-addon-gypi.patch -Patch6: nodejs-openssl-missing-api.patch -Patch7: nodejs-add_missing_shebang_to_read-package-json.patch +Patch1: nodejs-openssl-missing-api.patch BuildRequires: curl BuildRequires: gcc-c++ BuildRequires: procps @@ -39,12 +35,13 @@ %else BuildRequires: openssl-devel %endif -BuildRequires: fdupes +BuildRequires: libopenssl-devel BuildRequires: pkg-config BuildRequires: python BuildRequires: zlib-devel -Provides: npm = %{version} -Obsoletes: npm < %{version} +#BuildRequires: v8-devel +#BuildRequires: libcares-devel + #we need ABI virtual provides where SONAMEs aren't enough/not present so deps #break when binary compatibility is broken %global nodejs_abi 0.10 @@ -71,16 +68,21 @@ Provides an easy way to build scalable network programs http://nodejs.org + +%package docs +Summary: Node.js API documentation +Group: Documentation/Other +%if 0%{?suse_version} >= 1200 +# using noarch subpackage seems to break debuginfo on older releases +BuildArch: noarch +%endif + +%description docs +The API documentation for the Node.js JavaScript runtime. + %prep %setup -q -n node-v%{version} -%if %{_lib} == "lib64" -%patch0 -p1 -%else -%patch2 -p1 -%endif -%patch4 -p1 -%patch6 -%patch7 -p1 +%patch1 -p0 # Make sure nothing gets included from bundled deps: # We only delete the source and header files, because # the remaining build scripts are still used. @@ -89,14 +91,6 @@ find deps/$dir -name *.[ch] -delete done -# fix permissions of some files -find ./deps/npm/node_modules/request/ -type f -exec chmod 0644 {} \; - -chmod -x deps/v8/include/v8-debug.h -chmod 0644 ./deps/npm/node_modules/uid-number/get-uid-gid.js -chmod 0644 ./deps/npm/node_modules/npmconf/node_modules/config-chain/index.js -chmod 0755 ./deps/npm/scripts/release.sh - # remove .orig file find . -name "*.orig" -type f -delete -print @@ -109,46 +103,24 @@ --prefix=%{_prefix} \ --shared-openssl \ --shared-zlib \ - --gdb - -### --shared-v8 \ + --gdb \ + --without-npm \ + --without-dtrace +# --shared-v8 \ +# --shared-cares make %{?_smp_mflags} %install %{?make_install} %{!?make_install:make install DESTDIR=$RPM_BUILD_ROOT} -# npm man page -cp -p deps/npm/man/man1/npm.1 %{buildroot}/%{_mandir}/man1 -#install development headers -#FIXME: we probably don't really need *.h but node-gyp downloads the whole -#freaking source tree so I can't be sure ATM -mkdir -p %{buildroot}%{_includedir}/node -cp -p src/*.h %{buildroot}%{_includedir}/node -# Since we're using included V8, devel package would be incomplete without V8 headers -cp -pR deps/v8/include/*.h %{buildroot}%{_includedir}/node -cp -pR deps/uv/include/* %{buildroot}%{_includedir}/node #node-gyp needs common.gypi too mkdir -p %{buildroot}%{_datadir}/node cp -p common.gypi %{buildroot}%{_datadir}/node -find '%{buildroot}%{_libdir}/' -type f -name .travis.yml -delete -find '%{buildroot}%{_libdir}/' -type f -name .npmignore -delete -find '%{buildroot}%{_libdir}/' -type f -name .gitmodules -delete -find '%{buildroot}%{_libdir}/' -type f -name Makefile -delete -find '%{buildroot}%{_libdir}/' -type f $ -name .jshintrc -o -name pylintrc $ -delete -find '%{buildroot}%{_libdir}/' -type f $ -name '*.cmd' -o -name '*.bat' $ -delete -find '%{buildroot}%{_libdir}/node_modules/' -type d -name tests | while read d; do rm -rf "$d"; done -find '%{buildroot}%{_libdir}/node_modules/' -type d -name tools | while read d; do rm -rf "$d"; done -find '%{buildroot}%{_libdir}/node_modules/' -type d $ -name example -o -name examples $ | while read d; do rm -rf "$d"; done -rm '%{buildroot}%{_libdir}/node_modules/npm/node_modules/node-gyp/gyp/gyp_dummy.c' -rm '%{buildroot}%{_libdir}/node_modules/npm/node_modules/request/node_modules/http-signature/.dir-locals.el' -rm -rf '%{buildroot}%{_libdir}/node_modules/npm/node_modules/request/node_modules/node-uuid/benchmark' -find '%{buildroot}%{_libdir}/node_modules/' -type f -name '*_test*' -delete - # Documentation install -d %{buildroot}%{_docdir}/%{name} -cp -r doc/* %{buildroot}%{_docdir}/%{name}/ +cp -r doc/api %{buildroot}%{_docdir}/%{name}/ cp -r {AUTHORS,ChangeLog,CONTRIBUTING.md,LICENSE,README.md} %{buildroot}%{_docdir}/%{name}/ # RPM macros @@ -156,28 +128,31 @@ install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm # Own nodejs_modulesdir -%ifarch x86_64 ppc64 install -d %{buildroot}%{_prefix}/lib/node_modules -%endif -%fdupes %{buildroot}%{_libdir}/node_modules -%fdupes %{buildroot}%{_docdir}/%{name} +# fix permission +chmod 0644 %{buildroot}%{_includedir}/node/v8-debug.h %files %defattr(-, root, root) -%doc %{_docdir}/%{name} %config %{_sysconfdir}/rpm/macros.nodejs %{_bindir}/node -%{_bindir}/npm -%{_libdir}/node_modules -%ifarch x86_64 ppc64 -%dir %{_prefix}/lib/node_modules -%endif +%{_prefix}/lib/node_modules %{_mandir}/man1/* +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/AUTHORS +%{_docdir}/%{name}/ChangeLog +%{_docdir}/%{name}/CONTRIBUTING.md +%{_docdir}/%{name}/LICENSE +%{_docdir}/%{name}/README.md %files devel %defattr(-, root, root) %{_includedir}/node %{_datadir}/node +%files docs +%defattr(-,root,root) +%{_docdir}/%{name}/api + %changelog ++++++ macros.nodejs ++++++ --- /var/tmp/diff_new_pack.Xj72Cw/_old 2014-09-17 21:25:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Xj72Cw/_new 2014-09-17 21:25:13.000000000 +0200 @@ -4,6 +4,8 @@ %nodejs_requires \ Requires: nodejs +%nodejs_arches %{ix86} x86_64 %{arm} + %nodejs_install \ mkdir -p %{buildroot}%{nodejs_modulesdir} \ npm_config_prefix=%{buildroot}%{_prefix} npm install -g %{S:0} ++++++ node-v0.10.31.tar.gz -> node-v0.10.32.tar.gz ++++++ /work/SRC/openSUSE:Factory/nodejs/node-v0.10.31.tar.gz /work/SRC/openSUSE:Factory/.nodejs.new/node-v0.10.32.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lua for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package lua for openSUSE:Factory checked in at 2014-09-17 21:24:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua (Old) and /work/SRC/openSUSE:Factory/.lua.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lua" Changes: -------- --- /work/SRC/openSUSE:Factory/lua/lua.changes 2014-09-15 17:40:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lua.new/lua.changes 2014-09-17 21:25:09.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 17 15:04:25 UTC 2014 - i(a)marguerite.su + +- the %dir is still needed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua.spec ++++++ --- /var/tmp/diff_new_pack.RkhkS4/_old 2014-09-17 21:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.RkhkS4/_new 2014-09-17 21:25:10.000000000 +0200 @@ -168,6 +168,10 @@ %files %defattr(-,root,root) %doc README +%dir %{_libdir}/lua +%dir %{_libdir}/lua/%{major_version} +%dir %{_datadir}/lua +%dir %{_datadir}/lua/%{major_version} %{_bindir}/lua%{major_version} %{_bindir}/luac%{major_version} %{_mandir}/man1/lua%{major_version}.1.gz -- 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-Test-Class for openSUSE:Factory
by root＠hilbert.suse.de 17 Sep '14

17 Sep '14

Hello community, here is the log from the commit of package perl-Test-Class for openSUSE:Factory checked in at 2014-09-17 21:24:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Test-Class (Old) and /work/SRC/openSUSE:Factory/.perl-Test-Class.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Test-Class" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Test-Class/perl-Test-Class.changes 2013-12-22 19:37:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Test-Class.new/perl-Test-Class.changes 2014-09-17 21:25:08.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 15 12:52:34 UTC 2014 - coolo(a)suse.com + +- updated to 0.46 + - fix new teardown tests for MSWin32 + + 0.45 [2014-07-05] + - bump minimum required version of Test::More (RT#96951) + + 0.44 [2014-07-04] + - run teardown method even if test method dies, as in version 0.37 and + earlier + + 0.43 [2014-06-25] + - specify test prereqs as test_requires rather than build_requires + + 0.42 or the "how did I get stuck with co-maint?" release [2014-05-07] + - properly handle thrown exceptions that stringify to the empty string + before or after chomping (Karen Etheridge, PR#11) + +------------------------------------------------------------------- Old: ---- Test-Class-0.41.tar.gz New: ---- Test-Class-0.46.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Class.spec ++++++ --- /var/tmp/diff_new_pack.Q9zt4U/_old 2014-09-17 21:25:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Q9zt4U/_new 2014-09-17 21:25:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Test-Class # -# Copyright (c) 2013 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 @@ -17,36 +17,27 @@ Name: perl-Test-Class -Version: 0.41 +Version: 0.46 Release: 0 %define cpan_name Test-Class Summary: Easily create test classes in an xUnit/JUnit style License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Test-Class/ -Source: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(MRO::Compat) >= 0.11 -BuildRequires: perl(Module::Build) >= 0.4200 +BuildRequires: perl(Module::Build) >= 0.4004 BuildRequires: perl(Test::Builder) >= 0.78 BuildRequires: perl(Test::Exception) >= 0.25 BuildRequires: perl(Test::More) >= 0.78 -BuildRequires: perl(Test::Simple) >= 0.78 -#BuildRequires: perl(Base::Test) -#BuildRequires: perl(Foo) -#BuildRequires: perl(SomeClassThatDefinesNew) -#BuildRequires: perl(Test::Class) -#BuildRequires: perl(Test::Class::Load) -#BuildRequires: perl(TestClassLoadSubclass) -#BuildRequires: perl(Test::Class::MethodInfo) -#BuildRequires: perl(Tests::Foo) +BuildRequires: perl(Test::Simple) >= 1.001002 Requires: perl(MRO::Compat) >= 0.11 Requires: perl(Test::Builder) >= 0.78 -Requires: perl(Test::More) >= 0.78 -Requires: perl(Test::Simple) >= 0.78 +Requires: perl(Test::Simple) >= 1.001002 %{perl_requires} %description @@ -80,6 +71,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README xt +%doc Changes README xt %changelog ++++++ Test-Class-0.41.tar.gz -> Test-Class-0.46.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/Build.PL new/Test-Class-0.46/Build.PL --- old/Test-Class-0.41/Build.PL 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/Build.PL 2014-07-07 02:19:23.000000000 +0200 @@ -1,4 +1,4 @@ -use Module::Build; +use Module::Build 0.4004; # test_requires use strict; use warnings; @@ -11,19 +11,32 @@ my $build = Module::Build->new( module_name => 'Test::Class', license => 'perl', + configure_requires => { + 'Module::Build' => '0.4004', + }, requires => { 'perl' => '5.008001', 'Attribute::Handlers' => '0.77', 'MRO::Compat' => '0.11', 'Storable' => '2.04', - 'Test::Simple' => '0.78', + 'Test::Simple' => '1.001002', 'Test::Builder' => $tb_v, 'Test::Builder::Tester' => '1.02', - 'Test::More' => '0.78', + 'Carp' => '0', + 'File::Find' => '0', + 'File::Spec' => '0', + 'constant' => '0', + 'strict' => '0', + 'warnings' => '0', }, - build_requires => { + test_requires => { 'Test::Exception' => '0.25', 'IO::File' => '1.09', + 'Test::More' => '0.78', + 'Fcntl' => '0', + 'Test' => '0', + 'base' => '0', + 'overload' => '0', }, meta_merge => { resources => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/Changes new/Test-Class-0.46/Changes --- old/Test-Class-0.41/Changes 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/Changes 2014-07-07 02:19:23.000000000 +0200 @@ -1,5 +1,22 @@ Changes for Perl extension Test-Class +0.46 [2014-07-06] + - fix new teardown tests for MSWin32 + +0.45 [2014-07-05] + - bump minimum required version of Test::More (RT#96951) + +0.44 [2014-07-04] + - run teardown method even if test method dies, as in version 0.37 and + earlier + +0.43 [2014-06-25] + - specify test prereqs as test_requires rather than build_requires + +0.42 or the "how did I get stuck with co-maint?" release [2014-05-07] + - properly handle thrown exceptions that stringify to the empty string + before or after chomping (Karen Etheridge, PR#11) + 0.41 or the "0.99 was a bad year" release [2013-11-30] - require a newer Test::Builder if 0.99 is installed RT#90699 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/LICENSE new/Test-Class-0.46/LICENSE --- old/Test-Class-0.41/LICENSE 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,378 +0,0 @@ - -Terms of Perl itself - -a) the GNU General Public License as published by the Free - Software Foundation; either version 1, or (at your option) any - later version, or -b) the "Artistic License" - ----------------------------------------------------------------------------- - -The General Public License (GPL) -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, -Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute -verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to most of -the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you wish), that -you receive source code or can get it if you want it, that you can change the -software or use pieces of it in new free programs; and that you know you can do -these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a -fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show -them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced by -others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually obtain -patent licenses, in effect making the program proprietary. To prevent this, we -have made it clear that any patent must be licensed for everyone's free use or -not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND -MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or translated -into another language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and appropriately -publish on each copy an appropriate copyright notice and disclaimer of warranty; -keep intact all the notices that refer to this License and to the absence of any -warranty; and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you also -meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you -changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in -part contains or is derived from the Program or any part thereof, to be licensed -as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you -must cause it, when started running for such interactive use in the most ordinary -way, to print or display an announcement including an appropriate copyright -notice and a notice that there is no warranty (or else, saying that you provide a -warranty) and that users may redistribute the program under these conditions, -and telling the user how to view a copy of this License. (Exception: if the -Program itself is interactive but does not normally print such an announcement, -your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Program, the distribution of the whole must be on -the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to -work written entirely by you; rather, the intent is to exercise the right to control -the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and 2 -above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any -third party, for a charge no more than your cost of physically performing source -distribution, a complete machine-readable copy of the corresponding source -code, to be distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute -corresponding source code. (This alternative is allowed only for noncommercial -distribution and only if you received the program in object code or executable -form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all the -source code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the -executable. However, as a special exception, the source code distributed need -not include anything that is normally distributed (in either source or binary form) -with the major components (compiler, kernel, and so on) of the operating system -on which the executable runs, unless that component itself accompanies the -executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so long -as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not accept -this License. Therefore, by modifying or distributing the Program (or any work -based on the Program), you indicate your acceptance of this License to do so, -and all its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to copy, -distribute or modify the Program subject to these terms and conditions. You -may not impose any further restrictions on the recipients' exercise of the rights -granted herein. You are not responsible for enforcing compliance by third parties -to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed on -you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of this -License. If you cannot distribute so as to satisfy simultaneously your obligations -under this License and any other pertinent obligations, then as a consequence -you may not distribute the Program at all. For example, if a patent license would -not permit royalty-free redistribution of the Program by all those who receive -copies directly or indirectly through you, then the only way you could satisfy -both it and this License would be to refrain entirely from distribution of the -Program. - -If any portion of this section is held invalid or unenforceable under any particular -circumstance, the balance of the section is intended to apply and the section as -a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other -property right claims or to contest validity of any such claims; this section has -the sole purpose of protecting the integrity of the free software distribution -system, which is implemented by public license practices. Many people have -made generous contributions to the wide range of software distributed through -that system in reliance on consistent application of that system; it is up to the -author/donor to decide if he or she is willing to distribute software through any -other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries -either by patents or by copyrighted interfaces, the original copyright holder who -places the Program under this License may add an explicit geographical -distribution limitation excluding those countries, so that distribution is permitted -only in or among countries not thus excluded. In such case, this License -incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems or -concerns. - -Each version is given a distinguishing version number. If the Program specifies a -version number of this License which applies to it and "any later version", you -have the option of following the terms and conditions either of that version or of -any later version published by the Free Software Foundation. If the Program does -not specify a version number of this License, you may choose any version ever -published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of all -derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS -NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE -COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE -ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED -TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY -WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS -PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM -(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY -OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - - ----------------------------------------------------------------------------- - -The Artistic License - -Preamble - -The intent of this document is to state the conditions under which a Package -may be copied, such that the Copyright Holder maintains some semblance of -artistic control over the development of the package, while giving the users of the -package the right to use and distribute the Package in a more-or-less customary -fashion, plus the right to make reasonable modifications. - -Definitions: - -- "Package" refers to the collection of files distributed by the Copyright - Holder, and derivatives of that collection of files created through textual - modification. -- "Standard Version" refers to such a Package if it has not been modified, - or has been modified in accordance with the wishes of the Copyright - Holder. -- "Copyright Holder" is whoever is named in the copyright or copyrights for - the package. -- "You" is you, if you're thinking about copying or distributing this Package. -- "Reasonable copying fee" is whatever you can justify on the basis of - media cost, duplication charges, time of people involved, and so on. (You - will not be required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) -- "Freely Available" means that no fee is charged for the item itself, though - there may be fees involved in handling the item. It also means that - recipients of the item may redistribute it under the same conditions they - received it. - -1. You may make and give away verbatim copies of the source form of the -Standard Version of this Package without restriction, provided that you duplicate -all of the original copyright notices and associated disclaimers. - -2. You may apply bug fixes, portability fixes and other modifications derived from -the Public Domain or from the Copyright Holder. A Package modified in such a -way shall still be considered the Standard Version. - -3. You may otherwise modify your copy of this Package in any way, provided -that you insert a prominent notice in each changed file stating how and when -you changed that file, and provided that you do at least ONE of the following: - - a) place your modifications in the Public Domain or otherwise - make them Freely Available, such as by posting said modifications - to Usenet or an equivalent medium, or placing the modifications on - a major archive site such as ftp.uu.net, or by allowing the - Copyright Holder to include your modifications in the Standard - Version of the Package. - - b) use the modified Package only within your corporation or - organization. - - c) rename any non-standard executables so the names do not - conflict with standard executables, which must also be provided, - and provide a separate manual page for each non-standard - executable that clearly documents how it differs from the Standard - Version. - - d) make other distribution arrangements with the Copyright Holder. - -4. You may distribute the programs of this Package in object code or executable -form, provided that you do at least ONE of the following: - - a) distribute a Standard Version of the executables and library - files, together with instructions (in the manual page or equivalent) - on where to get the Standard Version. - - b) accompany the distribution with the machine-readable source of - the Package with your modifications. - - c) accompany any non-standard executables with their - corresponding Standard Version executables, giving the - non-standard executables non-standard names, and clearly - documenting the differences in manual pages (or equivalent), - together with instructions on where to get the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - -5. You may charge a reasonable copying fee for any distribution of this Package. -You may charge any fee you choose for support of this Package. You may not -charge a fee for this Package itself. However, you may distribute this Package in -aggregate with other (possibly commercial) programs as part of a larger -(possibly commercial) software distribution provided that you do not advertise -this Package as a product of your own. - -6. The scripts and library files supplied as input to or produced as output from -the programs of this Package do not automatically fall under the copyright of this -Package, but belong to whomever generated them, and may be sold -commercially, and may be aggregated with this Package. - -7. C or perl subroutines supplied by you and linked into this Package shall not -be considered part of this Package. - -8. The name of the Copyright Holder may not be used to endorse or promote -products derived from this software without specific prior written permission. - -9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR -PURPOSE. - -The End - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/MANIFEST new/Test-Class-0.46/MANIFEST --- old/Test-Class-0.41/MANIFEST 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/MANIFEST 2014-07-07 02:19:23.000000000 +0200 @@ -3,8 +3,11 @@ lib/Test/Class.pm lib/Test/Class/Load.pm lib/Test/Class/MethodInfo.pm -LICENSE +Makefile.PL MANIFEST This list of files +META.json +META.yml +README t/00-load.t t/20-load-classes.t t/21-load-subclassed.t @@ -38,6 +41,8 @@ t/run_all_tests.t t/runtests.t t/runtests_die.t +t/runtests_die_empty.t +t/runtests_die_nearlyempty.t t/runtests_extra.t t/runtests_noplan.t t/runtests_of.t @@ -53,6 +58,7 @@ t/spaces.t t/startup.t t/startup_that_dies.t +t/teardown-when-test-dies.t t/test-libs/fail/MyFail.pm t/test-libs/lib1/Tests/Foo.pm t/test-libs/lib1/Tests/Foo/Bar.pm @@ -76,7 +82,3 @@ xt/pmv.t xt/pod.t xt/spelling.t -Makefile.PL -README -META.yml -META.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/META.json new/Test-Class-0.46/META.json --- old/Test-Class-0.41/META.json 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/META.json 2014-07-07 02:19:23.000000000 +0200 @@ -4,7 +4,7 @@ "Adrian Howard <adrianh(a)quietstars.com>, Curtis \"Ovid\" Poe, <ovid at cpan.org>, Mark Morgan <makk384(a)gmail.com>." ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.4203", + "generated_by" : "Module::Build version 0.4205", "license" : [ "perl_5" ], @@ -14,42 +14,52 @@ }, "name" : "Test-Class", "prereqs" : { - "build" : { - "requires" : { - "IO::File" : "1.09", - "Test::Exception" : "0.25" - } - }, "configure" : { "requires" : { - "Module::Build" : "0.42" + "Module::Build" : "0.4004" } }, "runtime" : { "requires" : { "Attribute::Handlers" : "0.77", + "Carp" : "0", + "File::Find" : "0", + "File::Spec" : "0", "MRO::Compat" : "0.11", "Storable" : "2.04", "Test::Builder" : "0.78", "Test::Builder::Tester" : "1.02", + "Test::Simple" : "1.001002", + "constant" : "0", + "perl" : "5.008001", + "strict" : "0", + "warnings" : "0" + } + }, + "test" : { + "requires" : { + "Fcntl" : "0", + "IO::File" : "1.09", + "Test" : "0", + "Test::Exception" : "0.25", "Test::More" : "0.78", - "Test::Simple" : "0.78", - "perl" : "5.008001" + "base" : "0", + "overload" : "0" } } }, "provides" : { "Test::Class" : { "file" : "lib/Test/Class.pm", - "version" : "0.41" + "version" : "0.46" }, "Test::Class::Load" : { "file" : "lib/Test/Class/Load.pm", - "version" : "0.41" + "version" : "0.46" }, "Test::Class::MethodInfo" : { "file" : "lib/Test/Class/MethodInfo.pm", - "version" : "0.41" + "version" : "0.46" } }, "release_status" : "stable", @@ -61,5 +71,5 @@ "url" : "http://github.com/adrianh/test-class/" } }, - "version" : "0.41" + "version" : "0.46" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/META.yml new/Test-Class-0.46/META.yml --- old/Test-Class-0.41/META.yml 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/META.yml 2014-07-07 02:19:23.000000000 +0200 @@ -1,39 +1,49 @@ --- abstract: 'Easily create test classes in an xUnit/JUnit style' author: - - "Adrian Howard <adrianh(a)quietstars.com>, Curtis \"Ovid\" Poe, <ovid at cpan.org>, Mark Morgan <makk384(a)gmail.com>." + - 'Adrian Howard <adrianh(a)quietstars.com>, Curtis "Ovid" Poe, <ovid at cpan.org>, Mark Morgan <makk384(a)gmail.com>.' build_requires: - IO::File: 1.09 - Test::Exception: 0.25 + Fcntl: '0' + IO::File: '1.09' + Test: '0' + Test::Exception: '0.25' + Test::More: '0.78' + base: '0' + overload: '0' configure_requires: - Module::Build: 0.42 + Module::Build: '0.4004' dynamic_config: 1 -generated_by: 'Module::Build version 0.4203, CPAN::Meta::Converter version 2.132830' +generated_by: 'Module::Build version 0.4205, CPAN::Meta::Converter version 2.141520' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Test-Class provides: Test::Class: file: lib/Test/Class.pm - version: 0.41 + version: '0.46' Test::Class::Load: file: lib/Test/Class/Load.pm - version: 0.41 + version: '0.46' Test::Class::MethodInfo: file: lib/Test/Class/MethodInfo.pm - version: 0.41 + version: '0.46' requires: - Attribute::Handlers: 0.77 - MRO::Compat: 0.11 - Storable: 2.04 - Test::Builder: 0.78 - Test::Builder::Tester: 1.02 - Test::More: 0.78 - Test::Simple: 0.78 - perl: 5.008001 + Attribute::Handlers: '0.77' + Carp: '0' + File::Find: '0' + File::Spec: '0' + MRO::Compat: '0.11' + Storable: '2.04' + Test::Builder: '0.78' + Test::Builder::Tester: '1.02' + Test::Simple: '1.001002' + constant: '0' + perl: '5.008001' + strict: '0' + warnings: '0' resources: license: http://dev.perl.org/licenses/ repository: http://github.com/adrianh/test-class/ -version: 0.41 +version: '0.46' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/Makefile.PL new/Test-Class-0.46/Makefile.PL --- old/Test-Class-0.41/Makefile.PL 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/Makefile.PL 2014-07-07 02:19:23.000000000 +0200 @@ -1,4 +1,4 @@ -# Note: this file was auto-generated by Module::Build::Compat version 0.4203 +# Note: this file was auto-generated by Module::Build::Compat version 0.4205 require 5.008001; use ExtUtils::MakeMaker; WriteMakefile @@ -7,14 +7,17 @@ 'VERSION_FROM' => 'lib/Test/Class.pm', 'PREREQ_PM' => { 'Attribute::Handlers' => '0.77', - 'IO::File' => '1.09', + 'Carp' => '0', + 'File::Find' => '0', + 'File::Spec' => '0', 'MRO::Compat' => '0.11', 'Storable' => '2.04', 'Test::Builder' => '0.78', 'Test::Builder::Tester' => '1.02', - 'Test::Exception' => '0.25', - 'Test::More' => '0.78', - 'Test::Simple' => '0.78' + 'Test::Simple' => '1.001002', + 'constant' => '0', + 'strict' => '0', + 'warnings' => '0' }, 'INSTALLDIRS' => 'site', 'EXE_FILES' => [], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/lib/Test/Class/Load.pm new/Test-Class-0.46/lib/Test/Class/Load.pm --- old/Test-Class-0.41/lib/Test/Class/Load.pm 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/lib/Test/Class/Load.pm 2014-07-07 02:19:23.000000000 +0200 @@ -7,7 +7,7 @@ use File::Find; use File::Spec; -our $VERSION = '0.41'; +our $VERSION = '0.46'; # Override to get your own filter sub is_test_class { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/lib/Test/Class/MethodInfo.pm new/Test-Class-0.46/lib/Test/Class/MethodInfo.pm --- old/Test-Class-0.41/lib/Test/Class/MethodInfo.pm 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/lib/Test/Class/MethodInfo.pm 2014-07-07 02:19:23.000000000 +0200 @@ -4,7 +4,7 @@ package Test::Class::MethodInfo; use Carp; -our $VERSION = '0.41'; +our $VERSION = '0.46'; sub new { my ( $class, %param ) = @_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/lib/Test/Class.pm new/Test-Class-0.46/lib/Test/Class.pm --- old/Test-Class-0.41/lib/Test/Class.pm 2013-11-30 15:38:49.000000000 +0100 +++ new/Test-Class-0.46/lib/Test/Class.pm 2014-07-07 02:19:23.000000000 +0200 @@ -11,7 +11,7 @@ use Test::Builder; use Test::Class::MethodInfo; -our $VERSION = '0.41'; +our $VERSION = '0.46'; my $Check_block_has_run; { @@ -60,7 +60,7 @@ my ( $self, $class ) = @_; my $test_info = _test_info($self) or die "Test::Class internals seem confused. Did you override " - . "new() in a sub-class or via multiple inheritence?\n"; + . "new() in a sub-class or via multiple inheritance?\n"; return values %{ $test_info->{$class} }; }; @@ -252,6 +252,7 @@ $message .= " (for test method '$Current_method')" if defined $Current_method && $method ne $Current_method; _show_header($self, @$tests); + chomp $exception; $Builder->ok(0, "$message died ($exception)"); _threw_exception( $self, $method => 1 ); }; @@ -289,19 +290,18 @@ $skip_reason = eval {$self->$method}; $skip_reason = $method unless $skip_reason; my $exception = $@; - chomp($exception) if $exception; my $num_done = $Builder->current_test - $num_start; my $num_expected = _total_num_tests($self, $method); $num_expected = $num_done if $num_expected eq NO_PLAN; if ($num_done == $num_expected) { _exception_failure($self, $method, $exception, $tests) - unless $exception eq ''; + if $exception; } elsif ($num_done > $num_expected) { my $class = ref $self; $Builder->diag("expected $num_expected test(s) in $class\::$method, $num_done completed\n"); } else { until (($Builder->current_test - $num_start) >= $num_expected) { - if ($exception ne '') { + if ($exception) { _exception_failure($self, $method, $exception, $tests); $skip_reason = "$method died"; $exception = ''; @@ -391,6 +391,7 @@ _show_header($t, @tests) unless _has_no_tests($t, $method); $all_passed = 0 unless _run_method($t, $method, \@tests); if ( _threw_exception( $t, $method ) ) { + next if ($method eq $test); my $num_to_skip = _total_num_tests($t, @methods_to_run); $Builder->skip( "$method died" ) for ( 1 .. $num_to_skip ); last; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/t/runtests_die_empty.t new/Test-Class-0.46/t/runtests_die_empty.t --- old/Test-Class-0.41/t/runtests_die_empty.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Test-Class-0.46/t/runtests_die_empty.t 2014-07-07 02:19:23.000000000 +0200 @@ -0,0 +1,41 @@ +#! /usr/bin/perl -T + +use strict; +use warnings; + +package Object; +use overload + bool => sub { 1 }, # there is an exception here even if it stringifies as empty! + '""' => 'as_string', + fallback => 1; +sub new { + my ($class, %args) = @_; + bless { %args }, $class; +} +sub as_string { + return defined $_[0]->{message} + ? $_[0]->{message} + : ''; +} + +package Foo; +use Test::More; +use base qw(Test::Class); + +sub die_empty : Test(1) { + die Object->new(); + fail 'we should never get here'; +} + +package main; +use Test::Builder::Tester tests => 1; +$ENV{TEST_VERBOSE}=0; + +my $filename = sub { return (caller)[1] }->(); + +test_out( "not ok 1 - die_empty died ()"); +test_err( "# Failed test 'die_empty died ()'" ); +test_err( "# at $filename line 40."); +test_err( "# (in Foo->die_empty)" ); +Foo->runtests; +test_test("we can handle an exception that stringifies to the empty string"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/t/runtests_die_nearlyempty.t new/Test-Class-0.46/t/runtests_die_nearlyempty.t --- old/Test-Class-0.41/t/runtests_die_nearlyempty.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Test-Class-0.46/t/runtests_die_nearlyempty.t 2014-07-07 02:19:23.000000000 +0200 @@ -0,0 +1,37 @@ +#! /usr/bin/perl -T + +use strict; +use warnings; + +package Foo; +use Test::More; +use base qw(Test::Class); + +sub die_one_cr : Test(1) { + die "\n"; + fail 'we should never get here'; +} + +sub die_two_cr : Test(1) { + die "\n\n"; + fail 'we should never get here'; +} + +package main; +use Test::Builder::Tester tests => 1; +$ENV{TEST_VERBOSE}=0; + +my $filename = sub { return (caller)[1] }->(); + +test_out( "not ok 1 - die_one_cr died ()"); +test_err( "# Failed test 'die_one_cr died ()'" ); +test_err( "# at $filename line 36."); +test_err( "# (in Foo->die_one_cr)" ); +test_out( "not ok 2 - die_two_cr died ("); +test_out( "# )"); +test_err( "# Failed test 'die_two_cr died (" ); +test_err( "# )'"); +test_err( "# at $filename line 36."); +test_err( "# (in Foo->die_two_cr)" ); +Foo->runtests; +test_test("early die with nearly-empty messages handled"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Class-0.41/t/teardown-when-test-dies.t new/Test-Class-0.46/t/teardown-when-test-dies.t --- old/Test-Class-0.41/t/teardown-when-test-dies.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Test-Class-0.46/t/teardown-when-test-dies.t 2014-07-07 02:19:23.000000000 +0200 @@ -0,0 +1,29 @@ +#! /usr/bin/perl + +use strict; +use warnings; + +my $line; +{ + package TeardownWhenTestDies; + use base qw(Test::Class); + use Test::More; + + sub setup_that_runs : Test( setup => 1 ) { ok(1, "setup works"); } + + sub my_test_method : Tests { + BEGIN { $line = __LINE__ } die "oops!"; + } + + sub teardown_that_runs : Test( teardown => 1 ) { + ok(1, 'teardown is run'); + } +} + +use Test::Builder::Tester tests => 1; + +test_out("ok 1 - setup works\nnot ok 2 - my_test_method died (oops! at ${\ __FILE__ } line $line.)\nok 3 - teardown is run"); +test_fail( +2 ); +test_err( "# (in TeardownWhenTestDies->my_test_method)" ); +Test::Class->runtests; +test_test("exception in method, but teardown is still run"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0