rpms/httrack/devel httrack-3.43.9-desktop.patch, NONE, 1.1 httrack-3.43.9-openssl.patch, NONE, 1.1 httrack-3.43.9-utf-8.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 httrack.spec, 1.14, 1.15 sources, 1.4, 1.5 httrack-3.43.2-desktop.patch, 1.1, NONE httrack-3.43.2-openssl.patch, 1.1, NONE httrack-3.43.2-utf-8.patch, 1.1, NONE

Mon Mar 22 14:03:40 UTC 2010

Author: rishi

Update of /cvs/pkgs/rpms/httrack/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28483

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.43.9-desktop.patch httrack-3.43.9-openssl.patch 
	httrack-3.43.9-utf-8.patch 
Removed Files:
	httrack-3.43.2-desktop.patch httrack-3.43.2-openssl.patch 
	httrack-3.43.2-utf-8.patch 
Log Message:
* Mon Mar 22 2010 Debarshi Ray <rishi at fedoraproject.org> - 3.43.9-1
- Version bump to 3.42.93. (Red Hat Bugzilla #512420)
  * Fixed: application/xhtml+xml not seen as "html"
  * Fixed: URL encoding bugs with filenames containing '%' characters
  * Fixed: Flash link extraction has been improved
  * Fixed: "Open error when decompressing" errors due to temporary file
    generation problems
  * Fixed: code tag handling bug in certain cases leading to produce invalid
    links
  * Fixed: horrible SSL slowdowns due to bogus select() calls
  * Fixed: Konqueror fixes
  * Updated: Portugues-Brasil language file
- Updated the openssl patch to consume newer sonames.


httrack-3.43.9-desktop.patch:
 WebHTTrack-Websites.desktop |    2 +-
 WebHTTrack.desktop          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE httrack-3.43.9-desktop.patch ---
diff -urNp httrack-3.43.9.orig/html/server/div/WebHTTrack.desktop httrack-3.43.9/html/server/div/WebHTTrack.desktop
--- httrack-3.43.9.orig/html/server/div/WebHTTrack.desktop	2010-03-22 09:52:24.907354150 +0200
+++ httrack-3.43.9/html/server/div/WebHTTrack.desktop	2010-03-22 10:07:08.864355788 +0200
@@ -6,4 +6,4 @@ Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack
diff -urNp httrack-3.43.9.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.43.9/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.43.9.orig/html/server/div/WebHTTrack-Websites.desktop	2010-03-22 09:52:24.907354150 +0200
+++ httrack-3.43.9/html/server/div/WebHTTrack-Websites.desktop	2010-03-22 10:07:23.375634849 +0200
@@ -6,4 +6,4 @@ Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack

httrack-3.43.9-openssl.patch:
 htsmodules.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE httrack-3.43.9-openssl.patch ---
diff -urNp httrack-3.43.9.orig/src/htsmodules.c httrack-3.43.9/src/htsmodules.c
--- httrack-3.43.9.orig/src/htsmodules.c	2010-03-22 09:52:24.927354601 +0200
+++ httrack-3.43.9/src/htsmodules.c	2010-03-22 10:01:18.443355012 +0200
@@ -263,7 +263,16 @@ void htspe_init(void) {
       handle = LoadLibraryA((char*)"ssleay32");
 #else
       /* We are compatible with 0.9.6/7/8/8b and potentially above */
-      handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);  /* added 8g release too (Debarshi Ray) */
+      handle = dlopen("libssl.so.1.0.0", RTLD_LAZY);
+      if (handle == NULL) {
+		handle = dlopen("libssl.so.0.9.8k", RTLD_LAZY);
+	  }
+      if (handle == NULL) {
+		handle = dlopen("libssl.so.0.9.8j", RTLD_LAZY);
+	  }
+      if (handle == NULL) {
+		handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);
+	  }
       if (handle == NULL) {
 		handle = dlopen("libssl.so.0.9.8b", RTLD_LAZY);
 	  }

httrack-3.43.9-utf-8.patch:
 contact.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE httrack-3.43.9-utf-8.patch ---
diff -urNp httrack-3.43.9.orig/html/contact.html httrack-3.43.9/html/contact.html
--- httrack-3.43.9.orig/html/contact.html	2010-03-22 09:52:24.899365004 +0200
+++ httrack-3.43.9/html/contact.html	2010-03-22 10:15:11.689357257 +0200
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
 	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows 95, windows 98, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
 	<title>HTTrack Website Copier - Offline Browser</title>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Jan 2009 05:15:27 -0000	1.4
+++ .cvsignore	22 Mar 2010 14:03:40 -0000	1.5
@@ -1 +1 @@
-httrack-3.43-2.tar.gz
+httrack-3.43-9C.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- httrack.spec	1 Sep 2009 16:44:55 -0000	1.14
+++ httrack.spec	22 Mar 2010 14:03:40 -0000	1.15
@@ -1,5 +1,7 @@
 %if 0%{?fc9}%{?fc10}
   %define _openssl_version 0.9.8g
+%elif 0%{?fc11}
+  %define _openssl_version 0.9.8k
 %else
   %define _openssl_version 1.0.0
 %endif
@@ -11,12 +13,12 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.43.2
-Release:	5%{?dist}
+Version:	3.43.9
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.43-2.tar.gz
+Source0:	http://www.httrack.com/%{name}-3.43-9C.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
 Patch1:		%{name}-%{version}-utf-8.patch
@@ -164,25 +166,38 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*
 
 %changelog
+* Mon Mar 22 2010 Debarshi Ray <rishi at fedoraproject.org> - 3.43.9-1
+- Version bump to 3.42.93. (Red Hat Bugzilla #512420)
+  * Fixed: application/xhtml+xml not seen as "html"
+  * Fixed: URL encoding bugs with filenames containing '%' characters
+  * Fixed: Flash link extraction has been improved
+  * Fixed: "Open error when decompressing" errors due to temporary file
+    generation problems
+  * Fixed: code tag handling bug in certain cases leading to produce invalid
+    links
+  * Fixed: horrible SSL slowdowns due to bogus select() calls
+  * Fixed: Konqueror fixes
+  * Updated: Portugues-Brasil language file
+- Updated the openssl patch to consume newer sonames.
+
 * Tue Sep 01 2009 Jesse Keating <jkeating at redhat.com> - 3.43.2-5
-- Rebuild for openssl
+- Bumped to consume new openssl soname.
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.43.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Jul 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 3.43.2-4
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.43.2-3
 - Updated 'Requires: openssl = 0.9.8k'
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.43.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Feb 24 2009 Release Engineering <rel-eng at fedoraproject.org> - 3.43.2-2
+- Autorebuild for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
-- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
+- Version bump to 3.43.2. (Red Hat Bugzilla #476110)
 - Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.
 
 * Tue Sep 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42.93-1
-- Version bump to 3.42.93. Closes Red Hat Bugzilla bugs #457523
-  (CVE-2008-3429) and #460529.
+- Version bump to 3.42.93. (Red Hat Bugzilla #457523 (CVE-2008-3429), #460529)
 - Use of generic macros in the publicly exposed API fixed by upstream.
 - Use of xdg-open now added by upstream.
 - OpenSSL version updated by upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Jan 2009 05:15:27 -0000	1.4
+++ sources	22 Mar 2010 14:03:40 -0000	1.5
@@ -1 +1 @@
-a6debc9fe8b7049e5de986357c7dadd8  httrack-3.43-2.tar.gz
+d52539dfa39ee9bd2593ba44e2b3e149  httrack-3.43-9C.tar.gz


--- httrack-3.43.2-desktop.patch DELETED ---


--- httrack-3.43.2-openssl.patch DELETED ---


--- httrack-3.43.2-utf-8.patch DELETED ---

