rpms/httrack/F-8 httrack-3.42.93-desktop.patch, NONE, 1.1 httrack-3.42.93-utf-8.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 httrack.spec, 1.4, 1.5 sources, 1.2, 1.3
Debarshi Ray
rishi at fedoraproject.org
Tue Sep 9 21:08:40 UTC 2008
Author: rishi
Update of /cvs/pkgs/rpms/httrack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25259
Modified Files:
.cvsignore httrack.spec sources
Added Files:
httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch
Log Message:
* 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.
- 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.
- Linkage issues in libhtsjava.so fixed by upstream.
httrack-3.42.93-desktop.patch:
--- NEW FILE httrack-3.42.93-desktop.patch ---
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop httrack-3.42.93/html/server/div/WebHTTrack.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack.desktop 2008-08-16 15:03:53.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack.desktop 2008-09-09 19:29:32.168936695 +0530
@@ -2,10 +2,9 @@
Encoding=UTF-8
Version=1.0
Type=Application
-Categories=Application;Network
+Categories=Network;
Terminal=false
Name=WebHTTrack Website Copier
Comment=Copy websites to your computer
Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack
diff -urNp httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.42.93.orig/html/server/div/WebHTTrack-Websites.desktop 2008-08-16 15:03:43.000000000 +0530
+++ httrack-3.42.93/html/server/div/WebHTTrack-Websites.desktop 2008-09-09 19:28:38.927687527 +0530
@@ -2,10 +2,9 @@
Encoding=UTF-8
Version=1.0
Type=Application
-Categories=Application;Network
+Categories=Network;
Terminal=false
Name=Browse Mirrored Websites
Comment=Browse Websites Mirrored by WebHTTrack
Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
-Type=Application
+Icon=webhttrack
httrack-3.42.93-utf-8.patch:
--- NEW FILE httrack-3.42.93-utf-8.patch ---
diff -urNp httrack-3.42.1.orig/html/contact.html httrack-3.42.1/html/contact.html
--- httrack-3.42.1.orig/html/contact.html 2007-01-14 19:37:06.000000000 +0530
+++ httrack-3.42.1/html/contact.html 2007-11-18 18:49:48.000000000 +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-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Nov 2007 19:05:22 -0000 1.2
+++ .cvsignore 9 Sep 2008 21:08:10 -0000 1.3
@@ -1 +1 @@
-httrack-3.42.tar.gz
+httrack-3.43-BETA-4.tar.gz
Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-8/httrack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httrack.spec 23 Feb 2008 07:48:27 -0000 1.4
+++ httrack.spec 9 Sep 2008 21:08:10 -0000 1.5
@@ -11,29 +11,24 @@
Summary: Website copier and offline browser
Name: httrack
-Version: 3.42
-Release: 10%{?dist}
+Version: 3.42.93
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://www.httrack.com/
-Source0: http://www.httrack.com/%{name}-3.42.tar.gz
-Source1: htsglobal.h
+Source0: http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
Patch0: %{name}-%{version}-desktop.patch
-Patch1: %{name}-%{version}-generic-macros.patch
-Patch2: %{name}-%{version}-libhtsjava.patch
-Patch3: %{name}-%{version}-openssl.patch
-Patch4: %{name}-%{version}-utf-8.patch
-Patch5: %{name}-%{version}-xdg-utils.patch
+Patch1: %{name}-%{version}-utf-8.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: openssl = %{_openssl_version}
Requires: xdg-utils
-BuildRequires: chrpath
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
+BuildRequires: libtool
BuildRequires: zlib-devel
%description
@@ -56,15 +51,9 @@
This package contains development files for %{name}.
%prep
-%setup -q -n %{name}-3.42.1
+%setup -q -n %{name}-3.42.93
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-cp -p %{SOURCE1} ./src
# Suppress rpmlint error.
chmod 644 `find . -name "*.c" -perm /111 -print`
@@ -94,6 +83,10 @@
%build
%configure --disable-static
+# Remove rpaths.
+rm -f ./libtool
+cp %{_bindir}/libtool .
+
# Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -106,6 +99,7 @@
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+find $RPM_BUILD_ROOT -type f -name "*.a" -delete
# Remove generic header from /usr/include/httrack.
rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
@@ -141,11 +135,6 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/WebHTTrack-Websites.desktop
-# Remove rpaths.
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/htsserver
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libhtsjava.so.2.0.42
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -163,6 +152,10 @@
%doc html
%doc %{name}-doc.html
%doc templates
+%doc %{_mandir}/man1/htsserver.1*
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/proxytrack.1*
+%doc %{_mandir}/man1/webhttrack.1*
%{_bindir}/htsserver
%{_bindir}/%{name}
%{_bindir}/proxytrack
@@ -171,11 +164,8 @@
%{_datadir}/applications/fedora-WebHTTrack-Websites.desktop
%{_datadir}/pixmaps/%{name}.xpm
%{_datadir}/pixmaps/webhttrack.xpm
-%{_libdir}/*.so.*
-%{_mandir}/man1/htsserver.1.gz
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/proxytrack.1.gz
-%{_mandir}/man1/webhttrack.1.gz
+%{_libdir}/libhtsjava.so.*
+%{_libdir}/libhttrack.so.*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
@@ -183,12 +173,21 @@
%files devel
%defattr(-,root,root,-)
%doc libtest
-%{_libdir}/*.so
+%{_libdir}/libhtsjava.so
+%{_libdir}/libhttrack.so
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%changelog
+* 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.
+- 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.
+- Linkage issues in libhtsjava.so fixed by upstream.
+
* Thu Feb 21 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.42-10
- Fixed runtime problems with --excludedocs.
- Omitted unused direct shared library dependencies.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Nov 2007 19:05:22 -0000 1.2
+++ sources 9 Sep 2008 21:08:10 -0000 1.3
@@ -1 +1 @@
-8bb5f09ee007fe6e9875c070b57e0359 httrack-3.42.tar.gz
+fe3fbd3129ac96761bab34a5b1a77aa8 httrack-3.43-BETA-4.tar.gz
More information about the fedora-extras-commits
mailing list