rpms/deluge/F-9 .cvsignore, 1.36, 1.37 deluge.spec, 1.58, 1.59 sources, 1.36, 1.37

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14201

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Revert to 0.5.9.3; Add backported patch to fix CVE-2009-1760 in included libtorrent copy.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	21 Nov 2008 06:22:26 -0000	1.36
+++ .cvsignore	18 Jun 2009 08:24:32 -0000	1.37
@@ -1 +1 @@
-deluge-1.0.5.tar.bz2
+deluge-0.5.9.3.tar.gz


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-9/deluge.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- deluge.spec	21 Nov 2008 06:22:27 -0000	1.58
+++ deluge.spec	18 Jun 2009 08:24:32 -0000	1.59
@@ -2,18 +2,21 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		deluge
-Version:	1.0.5
-Release:	1%{?dist}
+Version:	0.5.9.3
+Release:	2%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://deluge-torrent.org/           
 
-Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2
+Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.gz
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # Source1:	%{name}-fixed-setup.py
 
+## Backported patch to fix CVE-2009-1760 in the included libtorrent copy.
+Patch0: 	%{name}-%{version}-CVE-2009-1760.diff
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	boost-devel
@@ -21,7 +24,6 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel
-BuildRequires:	python-setuptools
 ## Not used for now: Deluge builds against its own internal copy of
 ## rb_libtorrent. See below for more details. 
 # BuildRequires:	rb_libtorrent-devel
@@ -33,7 +35,6 @@ Requires:	dbus-x11
 Requires:	hicolor-icon-theme
 Requires:	pygtk2-libglade
 Requires:	pyOpenSSL
-Requires:	python-setuptools
 Requires:	pyxdg
 ## Deluge is now using its own internal copy of rb_libtorrent, which they have
 ## heavily modified. Patches were sent to the upstream rb_libtorrent devs,
@@ -63,9 +64,10 @@ even from behind a router with virtually
 
 
 %prep
-%setup -q
+%setup -qn "deluge-torrent-%{version}"
 ## Not building against system rb_libtorrent - see above.
 # install -m 0755 %{SOURCE1} ./setup.py
+%patch0 -b .CVE-2009-1760
 
 
 %build
@@ -78,6 +80,8 @@ CFLAGS="%{optflags}" %{__python} setup.p
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+## Fix the Icon name in the .desktop file: it shouldn't contain an extension.
+sed -i -e 's/Icon=deluge.png/Icon=deluge/' %{buildroot}%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora			\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--copy-name-to-generic-name			\
@@ -85,23 +89,23 @@ desktop-file-install --vendor fedora			\
 	--delete-original				\
 	--remove-category=Application			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc deluge/ui/webui/LICENSE deluge/ui/webui/TODO
+%doc LICENSE 
 %{python_sitearch}/%{name}/
 %{python_sitearch}/%{name}-%{version}-py2.5.egg-info
 %{_bindir}/%{name}
-%{_bindir}/%{name}d
+%{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/scalable/apps/%{name}.svg
 
 
 %post
@@ -121,6 +125,12 @@ fi
 
 
 %changelog
+* Thu Jun 18 2009 Peter Gordon <peter at thecodergeek.com> - 0.5.9.3-2
+- Revert CVS files to to 0.9.5.3
+- Add backported patch for the included copy of rb_libtorrent to fix
+  CVE-2009-1760 (#505523):
+  + 0.5.9.3-CVE-2009-1760.diff
+
 * Thu Nov 13 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.5-1
 - Update to new upstream release (1.0.5)
 - Drop desktop file icon name hack (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	21 Nov 2008 06:22:27 -0000	1.36
+++ sources	18 Jun 2009 08:24:32 -0000	1.37
@@ -1 +1 @@
-0b232b62d9b07e12a1443c4c5c92d800  deluge-1.0.5.tar.bz2
+57ee1e0353cdc90884bfd3d240e7c425  deluge-0.5.9.3.tar.gz