Commit 443662f4 authored by Till Kamppeter's avatar Till Kamppeter

Refreshed patches with quilt for the new 2.1.0 source code.

parent c245b43a
......@@ -19,7 +19,7 @@ Last-Update: 2015-10-02
IPPFIND_MAN = @IPPFIND_MAN@
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -308,7 +308,7 @@
@@ -309,7 +309,7 @@
libcups.so.2: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
......@@ -28,7 +28,7 @@ Last-Update: 2015-10-02
$(RM) `basename $@ .2`
$(LN) $@ `basename $@ .2`
@@ -329,7 +329,7 @@
@@ -330,7 +330,7 @@
-compatibility_version 2.0.0 \
-exported_symbols_list t.exp \
$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
......
......@@ -17,7 +17,7 @@ Last-Update: 2015-02-10
/*
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2182,7 +2182,7 @@
@@ -2184,7 +2184,7 @@
strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
......
......@@ -110,7 +110,7 @@ Last-Update: 2015-02-10
*/
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -540,6 +540,7 @@
@@ -541,6 +541,7 @@
DocumentRoot $root/doc
RequestRoot $BASE/spool
TempDir $BASE/spool/temp
......
......@@ -12,7 +12,7 @@ Last-Update: 2015-02-10
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -8352,6 +8352,11 @@
@@ -8351,6 +8351,11 @@
ipp_attribute_t *attr, /* Current attribute */
*attr2, /* Job attribute */
*prev2; /* Previous job attribute */
......@@ -24,7 +24,7 @@ Last-Update: 2015-02-10
/*
@@ -8413,6 +8418,85 @@
@@ -8412,6 +8417,85 @@
}
/*
......
......@@ -37,7 +37,7 @@ Last-Update: 2015-02-10
cupsDirClose(dir);
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1231,7 +1231,7 @@
@@ -1233,7 +1233,7 @@
else if (stat(command, &backinfo))
backroot = 0;
else
......
......@@ -5,7 +5,7 @@ Author: Didier Raboud <odyx@debian.org>
Last-Update: 2015-02-10
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -980,7 +980,7 @@
@@ -981,7 +981,7 @@
fi
# Error log messages
......
......@@ -6,7 +6,7 @@ Author: Didier Raboud <odyx@debian.org>
Last-Update: 2015-02-10
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -980,7 +980,7 @@
@@ -981,7 +981,7 @@
fi
# Error log messages
......
......@@ -5,7 +5,7 @@ Author: Didier Raboud <odyx@debian.org>
Last-Update: 2014-07-30
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -980,7 +980,7 @@
@@ -981,7 +981,7 @@
fi
# Error log messages
......
......@@ -9,7 +9,7 @@ Last-Update: 2015-02-10
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -980,7 +980,7 @@
@@ -981,7 +981,7 @@
fi
# Error log messages
......
......@@ -4,12 +4,12 @@ Last-Update: 2015-08-05
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -995,7 +995,7 @@
@@ -996,7 +996,7 @@
fi
# Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | $GREP -v 'Unable to initialize USB access via libusb, libusb error' | $GREP -v 'org.freedesktop.ColorManager' | $GREP -v -E 'Avahi client failed: -(1|26)' | wc -l | awk '{print $1}'`
if test $count != 8; then
echo "FAIL: $count warning messages, expected 18."
echo "FAIL: $count warning messages, expected 8."
$GREP '^W ' $BASE/log/error_log
......@@ -5,7 +5,7 @@ Author: Didier Raboud <odyx@debian.org>
Last-Update: 2015-02-10
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -467,6 +467,23 @@
@@ -468,6 +468,23 @@
instfilter pstoraster pstoraster raster
instfilter texttopdf texttopdf pdf
......
......@@ -5,7 +5,7 @@ Last-Update: 2015-08-06
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -504,7 +504,7 @@
@@ -505,7 +505,7 @@
cat >$BASE/cupsd.conf <<EOF
StrictConformance Yes
Browsing Off
......@@ -14,7 +14,7 @@ Last-Update: 2015-08-06
Listen $BASE/sock
PassEnv LOCALEDIR
PassEnv DYLD_INSERT_LIBRARIES
@@ -633,7 +633,7 @@
@@ -634,7 +634,7 @@
export SHLIB_PATH
CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
......@@ -23,7 +23,7 @@ Last-Update: 2015-08-06
CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -766,10 +766,10 @@
@@ -767,10 +767,10 @@
echo "" >>$strfile
if test $file = ipp-2.1.test; then
......
......@@ -6,7 +6,7 @@ Last-Update: 2015-02-10
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -782,6 +782,11 @@
@@ -783,6 +783,11 @@
echo "<PRE>" >>$strfile
for file in 5*.sh; do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment