From 9338a3283a514b4e46433e5147d9470dae941986f71768aef622e7723be16029 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 5 Jun 2008 15:19:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=38

---
 cups-1.3.7-configfile_NoBrowseAddress.patch | 16 ++++++++++++++++
 cups.changes                                |  5 +++++
 cups.spec                                   |  6 +++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 cups-1.3.7-configfile_NoBrowseAddress.patch

diff --git a/cups-1.3.7-configfile_NoBrowseAddress.patch b/cups-1.3.7-configfile_NoBrowseAddress.patch
new file mode 100644
index 0000000..d9fb2ba
--- /dev/null
+++ b/cups-1.3.7-configfile_NoBrowseAddress.patch
@@ -0,0 +1,16 @@
+--- cups-1.3.7/scheduler/conf.c.orig	2008-06-04 11:05:04.000000000 +0200
++++ cups-1.3.7/scheduler/conf.c	2008-06-04 11:26:14.000000000 +0200
+@@ -2298,6 +2298,13 @@
+ 
+       memset(dira, 0, sizeof(cupsd_dirsvc_addr_t));
+ 
++      if (!value)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR,
++			"No BrowseAdress given at line %d.", linenum);
++        continue;
++      }
++
+       if (!strcasecmp(value, "@LOCAL"))
+       {
+        /*
diff --git a/cups.changes b/cups.changes
index db02de4..5f27362 100644
--- a/cups.changes
+++ b/cups.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  4 11:35:27 CEST 2008 - kssingvo@suse.de
+
+- crash on startup when BrowseAddress has no value (bnc#396969)
+
 -------------------------------------------------------------------
 Mon May 19 21:35:24 CEST 2008 - kssingvo@suse.de
 
diff --git a/cups.spec b/cups.spec
index c7216bb..c298857 100644
--- a/cups.spec
+++ b/cups.spec
@@ -22,7 +22,7 @@ License:        GPL v2 or later
 Group:          Hardware/Printing
 Summary:        The Common UNIX Printing System
 Version:        1.3.7
-Release:        20
+Release:        24
 Requires:       cups-libs = %{version}, cups-client = %{version}
 Requires:       ghostscript_any, ghostscript-fonts-std, foomatic-filters
 Requires:       util-linux /usr/bin/pdftops
@@ -71,6 +71,7 @@ Patch19:        cups-1.3.7-filter_png_overflow.patch
 # next is found as http://www.cups.org/strfiles/2808/str2808.patch
 Patch20:        cups-1.4svn-pdftops_dont_fail_on_cancel.patch
 Patch21:        cups-1.3.7-keeping_recommended.patch
+Patch22:        cups-1.3.7-configfile_NoBrowseAddress.patch
 Patch100:       cups-1.1.23-testpage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -171,6 +172,7 @@ mv pdftops pdftos.use_filter_pdftops_c
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 if [ -f /.buildenv ]; then
 	. /.buildenv
 else
@@ -426,6 +428,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
 %{_datadir}/locale/*/cups_*
 
 %changelog
+* Wed Jun 04 2008 kssingvo@suse.de
+- crash on startup when BrowseAddress has no value (bnc#396969)
 * Mon May 19 2008 kssingvo@suse.de
 - added pdftops_any for 11.0 to Requires: (bugzilla#378434)
 * Thu May 15 2008 kssingvo@suse.de