- Updated to 1.0.9 for translations.

- Updated pysmbc to 1.0.6. No longer need pysmbc-git patch.
This commit is contained in:
Tim Waugh 2008-10-21 16:57:35 +00:00
parent 4efc2732a0
commit 91ce36f72d
9 changed files with 11 additions and 20455 deletions

View File

@ -183,3 +183,5 @@ pycups-1.9.42.tar.bz2
pysmbc-1.0.5.tar.bz2
system-config-printer-1.0.7.tar.bz2
system-config-printer-1.0.8.tar.bz2
pysmbc-1.0.6.tar.bz2
system-config-printer-1.0.9.tar.bz2

Binary file not shown.

BIN
pysmbc-1.0.6.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -1,105 +0,0 @@
diff -U0 pysmbc-1.0.5/ChangeLog.git pysmbc-1.0.5/ChangeLog
--- pysmbc-1.0.5/ChangeLog.git 2008-08-29 10:33:35.000000000 +0100
+++ pysmbc-1.0.5/ChangeLog 2008-10-17 10:10:28.000000000 +0100
@@ -0,0 +1,11 @@
+2008-10-17 Tim Waugh <twaugh@redhat.com>
+
+ * dir.c (Dir_getdents): Fixed crash when getdents provides more
+ than one batch of entries (bug #465975).
+
+2008-10-08 Tim Waugh <twaugh@redhat.com>
+
+ * test.py (Browser.__init__): Prevent unbound local variable
+ traceback when the auth dialog is cancelled.
+ (Browser.row_expanded): Likewise.
+
diff -up pysmbc-1.0.5/dir.c.git pysmbc-1.0.5/dir.c
--- pysmbc-1.0.5/dir.c.git 2008-06-09 13:19:54.000000000 +0100
+++ pysmbc-1.0.5/dir.c 2008-10-17 10:10:28.000000000 +0100
@@ -114,12 +114,10 @@ Dir_getdents (Dir *self)
SMBCCTX *ctx;
char dirbuf[1024];
smbc_getdents_fn fn;
- struct smbc_dirent *dirp;
int dirlen;
debugprintf ("-> Dir_getdents()\n");
ctx = self->context->context;
- dirp = (struct smbc_dirent *) dirbuf;
listobj = PyList_New (0);
fn = smbc_getFunctionGetdents (ctx);
errno = 0;
@@ -127,6 +125,8 @@ Dir_getdents (Dir *self)
(struct smbc_dirent *) dirbuf,
sizeof (dirbuf))) != 0)
{
+ struct smbc_dirent *dirp;
+
debugprintf ("dirlen = %d\n", dirlen);
if (dirlen < 0)
{
@@ -136,6 +136,7 @@ Dir_getdents (Dir *self)
return NULL;
}
+ dirp = (struct smbc_dirent *) dirbuf;
while (dirlen > 0)
{
PyObject *dent;
diff -up pysmbc-1.0.5/test.py.git pysmbc-1.0.5/test.py
--- pysmbc-1.0.5/test.py.git 2008-05-21 17:04:07.000000000 +0100
+++ pysmbc-1.0.5/test.py 2008-10-17 10:10:28.000000000 +0100
@@ -146,6 +146,7 @@ class Browser:
ctx.optionNoAutoAnonymousLogin = True
self.smbc = ctx
self.auth = AuthContext (w)
+ workgroups = None
try:
while self.auth.perform_authentication () > 0:
try:
@@ -153,9 +154,7 @@ class Browser:
except Exception, e:
self.auth.failed (e)
except RuntimeError, (e, s):
- if e == errno.ENOENT:
- workgroups = None
- else:
+ if e != errno.ENOENT:
raise
if workgroups:
@@ -201,6 +200,7 @@ class Browser:
uri = "smb://%s" % entry.name
self.auth = AuthContext (self.main)
+ servers = None
try:
while self.auth.perform_authentication () > 0:
try:
@@ -208,9 +208,7 @@ class Browser:
except Exception, e:
self.auth.failed (e)
except RuntimeError, (e, s):
- if e == errno.ENOENT:
- servers = None
- else:
+ if e != errno.ENOENT:
raise
if servers:
@@ -235,6 +233,7 @@ class Browser:
uri = "smb://%s" % entry.name
self.auth = AuthContext (self.main)
+ shares = None
try:
while self.auth.perform_authentication () > 0:
try:
@@ -242,7 +241,6 @@ class Browser:
except Exception, e:
self.auth.failed (e)
except RuntimeError, (e, s):
- shares = None
if e != errno.EACCES and e != errno.EPERM:
del self.expanding_row
raise

View File

@ -1,3 +1,3 @@
030379d4accc18c402cd1ec367524a3b pycups-1.9.42.tar.bz2
fb77befa25ad919f532e24ea8f9cdd36 pysmbc-1.0.5.tar.bz2
7cd1662e1ee658cd7815b1732c7fc604 system-config-printer-1.0.8.tar.bz2
ac8f98a40b0fc4b6ab4470f10489887a pysmbc-1.0.6.tar.bz2
accb926526b4c56c47ba732dd1028cb4 system-config-printer-1.0.9.tar.bz2

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,21 +1,19 @@
%define pycups_version 1.9.42
%define pysmbc_version 1.0.5
%define pysmbc_version 1.0.6
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Summary: A printer administration tool
Name: system-config-printer
Version: 1.0.8
Release: 7%{?dist}
Version: 1.0.9
Release: 1%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-1.0.x.patch
Patch2: pysmbc-git.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@ -62,9 +60,6 @@ the configuration tool.
%prep
%setup -q -a 1 -a 2
%patch1 -p1 -z .1.0.x
cd pysmbc-%{pysmbc_version}
%patch2 -p1 -z .git
%build
%configure
@ -154,6 +149,10 @@ rm -rf %buildroot
exit 0
%changelog
* Tue Oct 21 2008 Tim Waugh <twaugh@redhat.com> 1.0.9-1
- Updated to 1.0.9 for translations.
- Updated pysmbc to 1.0.6. No longer need pysmbc-git patch.
* Fri Oct 17 2008 Tim Waugh <twaugh@redhat.com> 1.0.8-7
- Added patch for pysmbc changes in git to prevent getdents crashing
(bug #465975).