Hello community, here is the log from the commit of package httrack for openSUSE:Factory checked in at 2013-08-27 20:48:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/httrack (Old) and /work/SRC/openSUSE:Factory/.httrack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "httrack" Changes: -------- --- /work/SRC/openSUSE:Factory/httrack/httrack.changes 2012-09-13 00:03:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.httrack.new/httrack.changes 2013-08-27 20:48:55.000000000 +0200 @@ -1,0 +2,71 @@ +Sat Aug 24 20:56:26 UTC 2013 - [email protected] + +- Update to 3.47.24: + + New: support for IDNA / RFC 3492 (punycode) handling + + New: openssl is no longer dynamically probed at stratup, but dynamically + linked + + Fixed: random closing of files/sockets, leading to + "zip_zipWriteInFileInZip_failed" assertion, "bogus state" messages, or + random garbage in downloaded files + + Fixed: libssl.dylib is now in the search list for libssl on OSX + (Nils Breunese) + + Fixed: bogus charset because the meta http-equiv tag is placed too far in + the html page + + Fixed: incorrect \\machine\dir structure build on Windows (TomZ) + + Fixed: do not force a file to have an extension unless it has a known type + (such as html), or a possibly known type (if delayed checks are disabled) + + Fixed: HTML 5 addition regarding "poster" attribute for the "video" tag + (Jason Ronallo) + + Fixed: memory leaks in proxytrack.c (Eric Searcy) + + Fixed: correctly set the Z flag in hts-cache/new.txt file (Peter) + + Fixed: parallel patch, typo regarding ICONV_LIBS (Sebastian Pipping) + + Fixed: memory leak in hashtable, that may lead to excessive memory + consumption + + Fixed: on Windows, fixed possible DLL local injection (CVE-2010-5252) + + Fixed: UTF-8 conversion bug on Linux that may lead to buggy filenames + + Fixed: zero-length files not being properly handled (not saved on disk, not + updated) (lugusto) + + Fixed: serious bug that may lead to download several times the same file, + and "Unexpected 412/416 error" errors + + Fixed: images in CSS were sometimes not correctly detected (Martin) + + Fixed: links within javascript events were sometimes not correctly detected + (wquatan) + + Fixed: webhttrack caused bus error on certain systems, such as Mac OSX, due + to the stack size (Patrick Gundlach) + + Fixed: bogus charset for requests when filenames have non-ascii characters + (Steven Hsiao) + + Fixed: bogus charset on disk when filenames have non-ascii characters + (Steven Hsiao) + + Fixed: fixed 260-characters path limit for Windows (lugusto) + + Fixed: non-ascii characters encoding issue inside query string (lugusto) + + Fixed: HTML entities not properly decoded inside URI and query string + + Fixed: URL-encoding issue within URI + + Fixed: --timeout alias did not work + + Fixed: more windows-specific fixes regarding 260-character path limit + + Fixed: escaping issue in top index + + Fixed: Linux build cleanup (gentoo patches merge, lintian fixes et al.) + + Fixed: Fixed div-by-zero when specifying more than 1000 connections per + seconds (probably not very common) + + Fixed: Mishandling of '+' in URLs introduced in 3.47-15 (sarclaudio) + + Fixed: "Wildcard domains in cookies do not match" + (alexei dot co at gmail dot com ) + + Fixed: buggy referer while parsing: the referer of all links in the page is + the current page being parsed, NOT the parent page. + (alexei dot com at gmail dot com) + + Fixed: Russian translation fixes by Oleg Komarov (komoleg at mail dot ru) + + New: Added .torrent => application/x-bittorrent built-in MIME type + (alexei dot co at gmail dot com) + + Fixed: unable to download an URL whose filename embeds special characters + such as # (lugusto) + + New: Croatian translation by Dominko Aždajić (domazd at mail dot ru) + + Fixed: url-escaping regression introduced in the previous subrelease +- Added new build requirement libopenssl-devel. +- Require libhttrack2 instead of httrack (not needed) in devel package. +- Require libopenssl-devel in devel package (some httrack headers require + openssl headers). +- Use desktop-file-utils instead of update-desktop-files for openSUSE > 12.1. +- Remove config.h from htsglobal.h since it is not installed. +- Removed httrack-fix-desktop.patch and added a fix inside the spec file. +- Rebased httrack-fix-strict-aliasing-punning.patch to apply cleanly. + +------------------------------------------------------------------- Old: ---- httrack-3.46.1.tar.gz httrack-fix-desktop.patch New: ---- httrack-3.47.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ httrack.spec ++++++ --- /var/tmp/diff_new_pack.D6dDVP/_old 2013-08-27 20:48:57.000000000 +0200 +++ /var/tmp/diff_new_pack.D6dDVP/_new 2013-08-27 20:48:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package httrack # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Malcolm Lewis [email protected] # # All modifications and additions to the file contributed by third parties @@ -17,23 +17,27 @@ # +%define so_ver 2 + Name: httrack -Version: 3.46.1 +Version: 3.47.24 Release: 0 -Summary: Offline browser utility +Summary: Offline Browser Utility License: GPL-3.0+ Group: Productivity/Networking/Web/Utilities -Url: http://www.httrack.com/page/1/en/index.html -Source0: http://download.httrack.com/httrack-%{version}.tar.gz -# PATCH-FIX-OPENSUSE httrack-fix-desktop.patch [email protected] -- Fix desktop files to conform to openSUSE requirements -Patch0: httrack-fix-desktop.patch -# PATCH-FIX-OPENSUSE httrack-fix-desktop.patch [email protected] -- Add -fno-strict-aliasing to DEFAULT_CFLAGS -Patch1: httrack-fix-strict-aliasing-punning.patch -%if 0%{?sles_version} < 11 +Url: http://www.httrack.com/ +Source0: http://download.httrack.com/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE httrack-fix-strict-aliasing-punning.patch [email protected] -- Add -fno-strict-aliasing to DEFAULT_CFLAGS +Patch0: httrack-fix-strict-aliasing-punning.patch +%if 0%{?suse_version} > 1210 +BuildRequires: desktop-file-utils %else +BuildRequires: update-desktop-files +%endif +%if 0%{?suse_version} >= 1100 BuildRequires: fdupes %endif -BuildRequires: update-desktop-files +BuildRequires: libopenssl-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,87 +58,104 @@ %package devel Summary: Development files for httrack Group: Development/Libraries/Other -Requires: %{name} = %{version} +Requires: libhttrack%{so_ver} = %{version} +Requires: libopenssl-devel %description devel This package contains the header and library files for httrack. -%package -n libhttrack2 +%package -n libhttrack%{so_ver} Summary: Shared library for httrack -Group: Development/Libraries/Other +Group: System/Libraries -%description -n libhttrack2 -This package contains the httrack shared libraries +%description -n libhttrack%{so_ver} +This package contains the httrack shared libraries. %prep %setup -q %patch0 -%patch1 + +# Remove build time references so build-compare can do its work +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" src/proxy/proxytrack.h src/htshelp.c + +# Fix permissions +chmod 644 AUTHORS %build -%configure --disable-static --disable-debug -make +%configure \ + --disable-static \ + --docdir=%{_docdir}/%{name} \ + --htmldir=%{_docdir}/%{name}/html +make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -%suse_update_desktop_file WebHTTrack-Websites -%suse_update_desktop_file WebHTTrack + +%if 0%{?suse_version} > 1210 +desktop-file-edit --add-category=WebBrowser %{buildroot}%{_datadir}/applications/WebHTTrack-Websites.desktop +desktop-file-edit --add-category=WebBrowser %{buildroot}%{_datadir}/applications/WebHTTrack.desktop +%else +%suse_update_desktop_file WebHTTrack-Websites Network WebBrowser +%suse_update_desktop_file WebHTTrack Network WebBrowser +%endif + # Remove generic header and libtool files find %{buildroot} -name 'config.h' -exec rm {} \; +sed -i '/#include "config.h"/d' %{buildroot}%{_includedir}/%{name}/htsglobal.h find %{buildroot} -name '*.la' -exec rm {} \; -# Clean up docs and icons -pushd %{buildroot}%{_datadir}/doc -rm -rf %{name} -cd ../%{name} -mv icons/*.xpm ../pixmaps/ -rm -rf ./icons -popd + +# Clean up icons +rm -f %{buildroot}%{_datadir}/pixmaps/httrack16x16.xpm +rm -f %{buildroot}%{_datadir}/pixmaps/httrack32x32.xpm +mv %{buildroot}%{_datadir}/pixmaps/httrack48x48.xpm %{buildroot}%{_datadir}/pixmaps/httrack.xpm + # For moving to docdir rm -rf ./libtest ./templates mv %{buildroot}%{_datadir}/%{name}/libtest . mv %{buildroot}%{_datadir}/%{name}/templates . -%if 0%{?sles_version} < 11 -%else -%fdupes %{buildroot} +# Install additional docs (do it manually to fix also rpmlint warning "files-duplicate") +cp -af AUTHORS COPYING README gpl-fr.txt greetings.txt history.txt httrack-doc.html license.txt templates/ %{buildroot}%{_docdir}/%{name}/ +# No need to be in there +rm -f %{buildroot}%{_docdir}/%{name}/html/{greetings.txt,history.txt,httrack-doc.html,license.txt} + +%if 0%{?suse_version} >= 1100 +%fdupes -s %{buildroot} %endif -%post -n libhttrack2 -p /sbin/ldconfig -%postun -n libhttrack2 -p /sbin/ldconfig +%post -n libhttrack%{so_ver} -p /sbin/ldconfig -%clean -%{?buildroot:rm -rf %{buildroot}} +%postun -n libhttrack%{so_ver} -p /sbin/ldconfig %files -%defattr(644,root,root,755) -%doc AUTHORS COPYING license.txt gpl-fr.txt -%doc httrack-doc.html templates %defattr(-,root,root,-) +%doc %{_docdir}/%{name}/ %{_bindir}/htsserver %{_bindir}/httrack %{_bindir}/proxytrack %{_bindir}/webhttrack -%dir %{_libdir}/%{name} %{_datadir}/applications/WebHTTrack-Websites.desktop %{_datadir}/applications/WebHTTrack.desktop +%dir %{_datadir}/icons/hicolor/ +%dir %{_datadir}/icons/hicolor/*/ +%dir %{_datadir}/icons/hicolor/*/apps/ +%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/pixmaps/*.xpm -%dir %{_datadir}/%{name} %{_datadir}/%{name}/ %{_mandir}/man1/*.gz -%exclude %{_libdir}/*.so -%exclude %{_libdir}/%{name}/*.so -%exclude %{_includedir}/%{name}/ %files devel -%defattr(-,root,root) -%doc libtest -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_libdir}/*.so +%defattr(-,root,root,-) +%doc libtest/ +%{_includedir}/%{name}/ +%dir %{_libdir}/%{name}/ %{_libdir}/%{name}/*.so +%{_libdir}/*.so -%files -n libhttrack2 +%files -n libhttrack%{so_ver} %defattr(-,root,root,-) +%dir %{_libdir}/%{name}/ %{_libdir}/%{name}/*.so.* -%{_libdir}/*.so.* +%{_libdir}/*.so.%{so_ver}* %changelog ++++++ httrack-3.46.1.tar.gz -> httrack-3.47.24.tar.gz ++++++ ++++ 119182 lines of diff (skipped) ++++++ httrack-fix-strict-aliasing-punning.patch ++++++ --- /var/tmp/diff_new_pack.D6dDVP/_old 2013-08-27 20:48:57.000000000 +0200 +++ /var/tmp/diff_new_pack.D6dDVP/_new 2013-08-27 20:48:57.000000000 +0200 @@ -1,8 +1,8 @@ ---- configure 2011-02-28 08:49:02.000000000 -0600 -+++ configure.orig 2011-07-16 20:53:46.000000000 -0500 -@@ -14427,7 +14427,7 @@ - DEFAULT_CFLAGS="" - DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \ +--- configure.orig 2013-08-17 13:27:28.000000000 +0300 ++++ configure 2013-08-18 19:20:47.989357512 +0300 +@@ -15313,7 +15313,7 @@ + ### Default CFLAGS + DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \ --Wnested-externs -D_REENTRANT" +-Wnested-externs -fno-strict-aliasing -D_REENTRANT" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
