Hello community,
here is the log from the commit of package zmd
checked in at Mon Apr 10 16:46:42 CEST 2006.
--------
--- zmd/zmd.changes 2006-04-09 13:20:21.000000000 +0200
+++ STABLE/zmd/zmd.changes 2006-04-10 15:53:37.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 10 15:01:42 CEST 2006 - thunder@suse.de
+
+- New tarball (svn r26891):
+- Yum sources only work with http/https/ftp (#163390).
+- Zypp sources accept http/https/ftp.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.Y36RBy/_old 2006-04-10 16:46:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Y36RBy/_new 2006-04-10 16:46:06.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel
URL: http://www.novell.com
Version: 7.1.1.0
-Release: 3
+Release: 5
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -156,6 +156,10 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Mon Apr 10 2006 - thunder@suse.de
+- New tarball (svn r26891):
+- Yum sources only work with http/https/ftp (#163390).
+- Zypp sources accept http/https/ftp.
* Sun Apr 09 2006 - aj@suse.de
- Fix postun script to use correct name.
* Fri Apr 07 2006 - thunder@suse.de
++++++ zmd-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog
--- old/zmd-7.1.1.0/modules/ChangeLog 2006-04-07 13:24:59.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-04-10 14:49:51.000000000 +0200
@@ -1,3 +1,12 @@
+2006-04-10 Dan Mills
+
+ * linux/ZyppService.cs: Accept ftp and http sources.
+
+2006-04-10 Tambet Ingo
+
+ * linux/YumService.cs: Reject uris that do not have 'http', 'https',
+ and 'ftp' as a scheme. Fixes #163390.
+
2006-04-07 Dan Mills
* linux/ZyppService.cs (Mount): Auto-detect Zypp URIs. Don't
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/YumService.cs new/zmd-7.1.1.0/modules/linux/YumService.cs
--- old/zmd-7.1.1.0/modules/linux/YumService.cs 2006-04-07 12:57:24.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-04-10 14:49:35.000000000 +0200
@@ -50,6 +50,19 @@
public override Progress Mount (ServiceType service_type, string uri, IDictionary properties) {
+ try {
+ Uri u = new Uri (uri);
+ string scheme = u.Scheme;
+
+ if (scheme != System.Uri.UriSchemeHttp &&
+ scheme != System.Uri.UriSchemeHttp &&
+ scheme != System.Uri.UriSchemeFtp)
+ throw new ZenException ("Invalid uri scheme '{0}'", scheme);
+
+ } catch (UriFormatException) {
+ throw new ZenException ("Invalid uri '{0}'", uri);
+ }
+
ICollection keys = properties.Keys;
if (keys.Count != 1)
throw new ZenException ("Please provide a name for the service");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ZyppService.cs new/zmd-7.1.1.0/modules/linux/ZyppService.cs
--- old/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-04-07 13:24:06.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-04-10 14:48:17.000000000 +0200
@@ -60,12 +60,6 @@
if (keys.Count != 1)
throw new ZenException ("Please provide a name for the service");
- if (uri.IndexOf ("http://") == 0 ||
- uri.IndexOf ("https://") == 0 ||
- uri.IndexOf ("ftp://") == 0) {
- throw new ZenException ("The ZMD Zypp service does not support HTTP, HTTPS, or FTP. Use the Yum service.");
- }
-
string name = "";
foreach (object key in keys) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...