OBS User unknown
2008-04-06 02:44:41 +00:00
committed by Git OBS Bridge
parent c00e9d8533
commit 132f08eae4
6 changed files with 39 additions and 31 deletions

View File

@@ -1,13 +0,0 @@
--- cups-1.3.6/cgi-bin/search.c.orig 2008-01-16 23:20:33.000000000 +0100
+++ cups-1.3.6/cgi-bin/search.c 2008-03-06 10:55:20.000000000 +0100
@@ -167,7 +167,9 @@ cgiCompileSearch(const char *query) /* I
* string + RE overhead...
*/
- wlen = (sptr - s) + 4 * wlen + 2 * strlen(prefix) + 4;
+ wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
+ if (lword)
+ wlen += strlen(lword);
if (wlen > slen)
{

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4003862daffd6887a52cf66a67a21854c1ecda15698bf44b2fe1fc12a833695
size 4079258

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe
size 3895825

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Apr 2 10:29:42 CEST 2008 - kssingvo@suse.de
- update to version 1.3.7:
bugfix version only, includes CVE-2008-0047 and CVE-2008-1373.
Refer to included CHANGES.txt file for full information
- worked on INFO in init file
- removed references to version SUSE 8.01 in specfile
-------------------------------------------------------------------
Thu Mar 6 10:56:10 CET 2008 - kssingvo@suse.de

View File

@@ -2,9 +2,10 @@
#
# Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany.
# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany.
# Copyright (C) 2002--2008 Klaus Singvogel, SUSE / Novell Inc.
#
# Author: Kurt Garloff <feedback@suse.de>, 2000
# Klaus Singvogel <feedback@suse.de>, 2002
# Klaus Singvogel <feedback@suse.de>, 2002--2008
#
# /etc/init.d/cupsd
#
@@ -18,11 +19,14 @@
# Provides: cupsd
# Required-Start: $local_fs $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Should-Start: earlykdm hotplug named portmap ptal slpd printbill hplip
# Should-Stop: portmap
# Should-Start: earlykdm dbus $named $portmap ptal slpd printbill hplip
# Should-Stop: $portmap
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Description: Start CUPS printer daemon
# Short-Description: CUPS printer daemon
# Description: Start CUPS to provide spooling and printing files
# functionality for local and remote printers. Even required if
# printers are broadcasted ("Browsing") into (sub)nets.
### END INIT INFO
# Source SuSE config, only if exists with size greater zero

View File

@@ -1,5 +1,5 @@
#
# spec file for package cups (Version 1.3.6)
# spec file for package cups (Version 1.3.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,13 +12,17 @@
Name: cups
BuildRequires: dbus-1-devel gcc-c++ libpng-devel libtiff-devel openldap2-devel openslp-devel openssl-devel pam-devel tcpd-devel update-desktop-files
BuildRequires: dbus-1-devel gcc-c++ libpng-devel libtiff-devel openldap2-devel
BuildRequires: openslp-devel openssl-devel pam-devel tcpd-devel
BuildRequires: update-desktop-files
PreReq: textutils, fileutils, sh-utils, %insserv_prereq,
PreReq: %fillup_prereq /usr/sbin/groupadd
Url: http://www.cups.org/
License: GPL v2 or later
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.3.6
Release: 7
Version: 1.3.7
Release: 1
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux
@@ -29,7 +33,7 @@ Source2: lphelp.c
Source3: dvitops
Source4: pswrite
Source7: ogonki
Source8: rccups
Source8: cups.init
Source9: http://amaru.ti6.tu-harburg.de/portal/Members/ti6ntm/Projekte/Printanalyzer/PrintAnalyzer
Source10: http://homepages.nyu.edu/~ml1100/files/quosnmp
Source11: setcupsbroadcasting
@@ -53,12 +57,8 @@ Patch14: cups-1.1.21-testppd_duplex.patch
Patch15: cups-1.2.11-testppd_filename.patch
Patch16: cups-1.2.5-desktop_file.patch
Patch17: cups-1.3.3-testppd_none.patch
Patch18: cups-1.3.6-search_regex.patch
Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version >= 801
PreReq: textutils, fileutils, sh-utils, %insserv_prereq, %fillup_prereq /usr/sbin/groupadd
%endif
%description
The Common UNIX Printing System provides a portable printing layer for
@@ -80,6 +80,7 @@ Authors:
%define CPUs %(grep -c ^processor\ /proc/cpuinfo || echo 1)
%package libs
License: GPL v2 or later; LGPL v2.1 or later
Summary: Libraries for CUPS
Group: Hardware/Printing
@@ -96,6 +97,7 @@ Authors:
Easy Software Products <cups@cups.org>
%package client
License: GPL v2 or later
Summary: CUPS Client Programs
Group: Hardware/Printing
Conflicts: plp lprold lprng
@@ -114,6 +116,7 @@ Authors:
Easy Software Products <cups@cups.org>
%package devel
License: GPL v2 or later
Summary: Development Environment for CUPS
Group: Development/Libraries/C and C++
Requires: %{name}-libs = %{version} openssl-devel glibc-devel
@@ -147,7 +150,6 @@ Authors:
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
if [ -f /.buildenv ]; then
. /.buildenv
else
@@ -388,6 +390,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
%{_datadir}/locale/*/cups_*
%changelog
* Wed Apr 02 2008 kssingvo@suse.de
- update to version 1.3.7:
bugfix version only, includes CVE-2008-0047 and CVE-2008-1373.
Refer to included CHANGES.txt file for full information
- worked on INFO in init file
- removed references to version SUSE 8.01 in specfile
* Thu Mar 06 2008 kssingvo@suse.de
- fixed issue in cgi-bin search CVE-2008-0047 (bugzilla#367225)
* Fri Feb 29 2008 kssingvo@suse.de
@@ -1455,7 +1463,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
- updated to version 1.1.16, removed or adapted SuSE patches
* Tue Sep 10 2002 ro@suse.de
- added prereq for groupadd (#19300)
* Thu Sep 05 2002 ro@suse.de
* Fri Sep 06 2002 ro@suse.de
- fix postinstall
* Thu Sep 05 2002 kssingvo@suse.de
- changed %%post: removed "insserv" to make yast2 and security happy