rpms/httrack/F-10 httrack-3.43.2-desktop.patch, NONE, 1.1 httrack-3.43.2-openssl.patch, NONE, 1.1 httrack-3.43.2-utf-8.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 httrack.spec, 1.9, 1.10 sources, 1.3, 1.4 httrack-3.42.93-desktop.patch, 1.1, NONE httrack-3.42.93-utf-8.patch, 1.1, NONE

Wed Jan 21 05:13:30 UTC 2009

Author: rishi

Update of /cvs/pkgs/rpms/httrack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9961

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.43.2-desktop.patch httrack-3.43.2-openssl.patch 
	httrack-3.43.2-utf-8.patch 
Removed Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Log Message:
* 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.
- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.


httrack-3.43.2-desktop.patch:

--- NEW FILE httrack-3.43.2-desktop.patch ---
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop httrack-3.43.2/html/server/div/WebHTTrack.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack.desktop	2008-12-15 03:00:53.439047073 +0530
@@ -7,4 +7,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.2.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 03:01:18.262046434 +0530
@@ -7,4 +7,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.2-openssl.patch:

--- NEW FILE httrack-3.43.2-openssl.patch ---
diff -urNp httrack-3.43.2.orig/src/htsmodules.c httrack-3.43.2/src/htsmodules.c
--- httrack-3.43.2.orig/src/htsmodules.c	2008-12-31 22:41:53.000000000 +0530
+++ httrack-3.43.2/src/htsmodules.c	2009-01-20 22:42:30.000000000 +0530
@@ -263,7 +263,10 @@ 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.0.9.8j", RTLD_LAZY);  /* added 8j release too (Debarshi Ray) */
+      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.2-utf-8.patch:

--- NEW FILE httrack-3.43.2-utf-8.patch ---
diff -urNp httrack-3.43.2.orig/html/contact.html httrack-3.43.2/html/contact.html
--- httrack-3.43.2.orig/html/contact.html	2008-12-15 02:55:45.049072368 +0530
+++ httrack-3.43.2/html/contact.html	2008-12-15 03:07:40.608796440 +0530
@@ -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/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 21:15:36 -0000	1.3
+++ .cvsignore	21 Jan 2009 05:13:00 -0000	1.4
@@ -1 +1 @@
-httrack-3.43-BETA-4.tar.gz
+httrack-3.43-2.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-10/httrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- httrack.spec	9 Sep 2008 21:15:36 -0000	1.9
+++ httrack.spec	21 Jan 2009 05:13:00 -0000	1.10
@@ -1,7 +1,7 @@
-%if 0%{?fc7}%{?fc8}
-  %define _openssl_version 0.9.8b
-%else
+%if 0%{?fc9}%{?fc10}
   %define _openssl_version 0.9.8g
+%else
+  %define _openssl_version 0.9.8j
 %endif
 
 %if 0%{?fc7}
@@ -11,15 +11,16 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42.93
+Version:	3.43.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
+Source0:	http://www.httrack.com/%{name}-3.43-2.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
 Patch1:		%{name}-%{version}-utf-8.patch
+Patch2:		%{name}-%{version}-openssl.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -51,32 +52,12 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.93
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Suppress rpmlint error.
-chmod 644 `find . -name "*.c" -perm /111 -print`
-chmod 644 `find . -name "*.h" -perm /111 -print`
-dos2unix ./AUTHORS
-dos2unix ./README
-dos2unix ./gpl.txt
-dos2unix ./gpl-fr.txt
-dos2unix ./greetings.txt
-dos2unix ./history.txt
-dos2unix ./html/step3.html
-dos2unix ./%{name}-doc.html
-dos2unix ./libtest/*.c
-dos2unix ./libtest/example.h
-dos2unix ./libtest/readme.txt
-dos2unix ./license.txt
-dos2unix ./templates/*.html
-iconv --from-code ISO8859-1 --to-code UTF-8 ./gpl-fr.txt \
-  --output gpl-fr.utf-8 && mv gpl-fr.utf-8 ./gpl-fr.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./greetings.txt \
-  --output greetings.utf-8 && mv greetings.utf-8 ./greetings.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./history.txt \
-  --output history.utf-8 && mv history.utf-8 ./history.txt
 iconv --from-code ISO8859-1 --to-code UTF-8 ./html/contact.html \
   --output contact.utf-8 && mv contact.utf-8 ./html/contact.html
 
@@ -149,7 +130,10 @@
 %doc README
 %doc gpl.txt
 %doc gpl-fr.txt
+%doc greetings.txt
+%doc history.txt
 %doc html
+%doc license.txt
 %doc %{name}-doc.html
 %doc templates
 %doc %{_mandir}/man1/htsserver.1*
@@ -180,9 +164,13 @@
 %{_includedir}/%{name}/*
 
 %changelog
+* 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.
+- 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.
+  (CVE-2008-3429) and #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/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 21:15:36 -0000	1.3
+++ sources	21 Jan 2009 05:13:00 -0000	1.4
@@ -1 +1 @@
-fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz
+a6debc9fe8b7049e5de986357c7dadd8  httrack-3.43-2.tar.gz


--- httrack-3.42.93-desktop.patch DELETED ---


--- httrack-3.42.93-utf-8.patch DELETED ---


