- Include fixes from svn up to revision 7304. No longer need str2703 patch.
This commit is contained in:
parent
df50584cda
commit
5427dc2a2d
551
cups-1.3.x.patch
551
cups-1.3.x.patch
File diff suppressed because it is too large
Load Diff
@ -1,32 +0,0 @@
|
||||
diff -up cups-1.3.5/cgi-bin/admin.c.str2703 cups-1.3.5/cgi-bin/admin.c
|
||||
--- cups-1.3.5/cgi-bin/admin.c.str2703 2008-02-12 16:36:28.000000000 +0000
|
||||
+++ cups-1.3.5/cgi-bin/admin.c 2008-02-12 16:37:38.000000000 +0000
|
||||
@@ -1373,13 +1373,16 @@ do_config_server(http_t *http) /* I - H
|
||||
*/
|
||||
|
||||
if (cgiGetVariable("KERBEROS"))
|
||||
- default_auth_type = "Negotiate";
|
||||
+ default_auth_type = strdup ("Negotiate");
|
||||
else
|
||||
{
|
||||
- default_auth_type = cupsGetOption("DefaultAuthType", num_settings,
|
||||
- settings);
|
||||
+ default_auth_type = strdup (cupsGetOption("DefaultAuthType", num_settings,
|
||||
+ settings));
|
||||
if (!strcasecmp(default_auth_type, "Negotiate"))
|
||||
- default_auth_type = "Basic";
|
||||
+ {
|
||||
+ free (default_auth_type);
|
||||
+ default_auth_type = strdup ("Basic");
|
||||
+ }
|
||||
}
|
||||
|
||||
fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
|
||||
@@ -1429,6 +1432,7 @@ do_config_server(http_t *http) /* I - H
|
||||
#ifdef HAVE_GSSAPI
|
||||
num_settings = cupsAddOption("DefaultAuthType", default_auth_type,
|
||||
num_settings, &settings);
|
||||
+ free (default_auth_type);
|
||||
#endif /* HAVE_GSSAPI */
|
||||
|
||||
if (!cupsAdminSetServerSettings(http, num_settings, settings))
|
@ -6,7 +6,7 @@
|
||||
Summary: Common Unix Printing System
|
||||
Name: cups
|
||||
Version: 1.3.5
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Daemons
|
||||
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
|
||||
@ -43,7 +43,6 @@ Patch14: cups-lpr-help.patch
|
||||
Patch15: cups-peercred.patch
|
||||
Patch16: cups-pid.patch
|
||||
Patch17: cups-foomatic-recommended.patch
|
||||
Patch18: cups-str2703.patch
|
||||
Patch19: cups-eggcups.patch
|
||||
Patch20: cups-getpass.patch
|
||||
Patch21: cups-driverd-timeout.patch
|
||||
@ -159,7 +158,6 @@ lpd emulation.
|
||||
%patch15 -p1 -b .peercred
|
||||
%patch16 -p1 -b .pid
|
||||
%patch17 -p1 -b .foomatic-recommended
|
||||
%patch18 -p1 -b .str2703
|
||||
%patch19 -p1 -b .eggcups
|
||||
%patch20 -p1 -b .getpass
|
||||
%patch21 -p1 -b .driverd-timeout
|
||||
@ -459,7 +457,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{cups_serverbin}/daemon/cups-lpd
|
||||
|
||||
%changelog
|
||||
* Thu Feb 14 2008 Tim Waugh <twaugh@redhat.com>
|
||||
* Thu Feb 14 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.5-6
|
||||
- Include fixes from svn up to revision 7304. No longer need str2703 patch.
|
||||
- Try out logrotate again (bug #432730).
|
||||
|
||||
* Tue Feb 12 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.5-5
|
||||
|
Loading…
Reference in New Issue
Block a user