1.7rc1
This commit is contained in:
Jiri Popelka
parent
858f711004
commit
b4e6be73a5
1
.gitignore
vendored
1
.gitignore
vendored
@ -55,3 +55,4 @@ cups-1.4.4-source.tar.bz2
|
||||
/cups-1.6.1-source.tar.bz2
|
||||
/cups-1.6.2-source.tar.bz2
|
||||
/cups-1.7b1-source.tar.bz2
|
||||
/cups-1.7rc1-source.tar.bz2
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up cups-1.7b1/cups/ipp.c.va_list cups-1.7b1/cups/ipp.c
|
||||
--- cups-1.7b1/cups/ipp.c.va_list 2013-03-14 19:45:49.000000000 +0100
|
||||
+++ cups-1.7b1/cups/ipp.c 2013-04-29 15:45:52.680403846 +0200
|
||||
@@ -1210,7 +1210,7 @@ ippAddStringfv(ipp_t *ipp, /* I -
|
||||
group == IPP_TAG_END || group >= IPP_TAG_UNSUPPORTED_VALUE ||
|
||||
(value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG &&
|
||||
value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE ||
|
||||
- !format || !ap)
|
||||
+ !format)
|
||||
return (NULL);
|
||||
|
||||
if ((value_tag == IPP_TAG_TEXTLANG || value_tag == IPP_TAG_NAMELANG)
|
||||
@@ -4449,7 +4449,7 @@ ippSetStringfv(ipp_t *ipp, /*
|
||||
if (!ipp || !attr || !*attr ||
|
||||
(value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG &&
|
||||
value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE ||
|
||||
- !format || !ap)
|
||||
+ !format)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up cups-1.6.2/man/cups-lpd.man.in.lpd-manpage cups-1.6.2/man/cups-lpd.man.in
|
||||
--- cups-1.6.2/man/cups-lpd.man.in.lpd-manpage 2013-01-10 17:58:21.000000000 +0100
|
||||
+++ cups-1.6.2/man/cups-lpd.man.in 2013-03-18 18:59:46.837056613 +0100
|
||||
diff -up cups-1.7rc1/man/cups-lpd.man.in.lpd-manpage cups-1.7rc1/man/cups-lpd.man.in
|
||||
--- cups-1.7rc1/man/cups-lpd.man.in.lpd-manpage 2013-07-08 23:15:13.000000000 +0200
|
||||
+++ cups-1.7rc1/man/cups-lpd.man.in 2013-07-12 11:20:15.806737389 +0200
|
||||
@@ -26,39 +26,8 @@ cups-lpd \- receive print jobs and repor
|
||||
\fIcups-lpd\fR is the CUPS Line Printer Daemon ("LPD")
|
||||
mini-server that supports legacy client systems that use the LPD
|
||||
@ -12,7 +12,7 @@ diff -up cups-1.6.2/man/cups-lpd.man.in.lpd-manpage cups-1.6.2/man/cups-lpd.man.
|
||||
-.br
|
||||
-.nf
|
||||
-
|
||||
- printer stream tcp nowait lp @CUPS_SERVERBIN@/daemon/cups-lpd cups-lpd \\
|
||||
- printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\
|
||||
- -o document-format=application/octet-stream
|
||||
-.fi
|
||||
-.LP
|
||||
@ -34,7 +34,7 @@ diff -up cups-1.6.2/man/cups-lpd.man.in.lpd-manpage cups-1.6.2/man/cups-lpd.man.
|
||||
- user = lp
|
||||
- group = sys
|
||||
- passenv =
|
||||
- server = @CUPS_SERVERBIN@/daemon/cups-lpd
|
||||
- server = /usr/lib/cups/daemon/cups-lpd
|
||||
- server_args = -o document-format=application/octet-stream
|
||||
- }
|
||||
-.fi
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -up cups-1.6.2/config.h.in.systemd-socket cups-1.6.2/config.h.in
|
||||
--- cups-1.6.2/config.h.in.systemd-socket 2012-12-17 23:17:08.000000000 +0100
|
||||
+++ cups-1.6.2/config.h.in 2013-03-18 18:53:53.768961644 +0100
|
||||
@@ -487,6 +487,13 @@
|
||||
diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
|
||||
--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200
|
||||
+++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200
|
||||
@@ -451,6 +451,13 @@
|
||||
|
||||
|
||||
/*
|
||||
@ -15,9 +15,9 @@ diff -up cups-1.6.2/config.h.in.systemd-socket cups-1.6.2/config.h.in
|
||||
* Various scripting languages...
|
||||
*/
|
||||
|
||||
diff -up cups-1.6.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.6.2/config-scripts/cups-systemd.m4
|
||||
--- cups-1.6.2/config-scripts/cups-systemd.m4.systemd-socket 2013-03-18 18:53:53.769961630 +0100
|
||||
+++ cups-1.6.2/config-scripts/cups-systemd.m4 2013-03-18 18:53:53.769961630 +0100
|
||||
diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
|
||||
--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200
|
||||
+++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200
|
||||
@@ -0,0 +1,36 @@
|
||||
+dnl
|
||||
+dnl "$Id$"
|
||||
@ -55,9 +55,9 @@ diff -up cups-1.6.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.6.2/con
|
||||
+dnl
|
||||
+dnl "$Id$"
|
||||
+dnl
|
||||
diff -up cups-1.6.2/configure.in.systemd-socket cups-1.6.2/configure.in
|
||||
--- cups-1.6.2/configure.in.systemd-socket 2013-03-18 18:00:03.000000000 +0100
|
||||
+++ cups-1.6.2/configure.in 2013-03-18 18:55:30.773612461 +0100
|
||||
diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
|
||||
--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
|
||||
+++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200
|
||||
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
|
||||
sinclude(config-scripts/cups-largefile.m4)
|
||||
sinclude(config-scripts/cups-dnssd.m4)
|
||||
@ -76,10 +76,10 @@ diff -up cups-1.6.2/configure.in.systemd-socket cups-1.6.2/configure.in
|
||||
desktop/cups.desktop
|
||||
doc/help/ref-cups-files-conf.html
|
||||
doc/help/ref-cupsd-conf.html
|
||||
diff -up cups-1.6.2/cups/usersys.c.systemd-socket cups-1.6.2/cups/usersys.c
|
||||
--- cups-1.6.2/cups/usersys.c.systemd-socket 2013-03-12 15:26:28.000000000 +0100
|
||||
+++ cups-1.6.2/cups/usersys.c 2013-03-18 18:53:53.769961630 +0100
|
||||
@@ -964,7 +964,7 @@ cups_read_client_conf(
|
||||
diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
|
||||
--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200
|
||||
+++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200
|
||||
@@ -1046,7 +1046,7 @@ cups_read_client_conf(
|
||||
struct stat sockinfo; /* Domain socket information */
|
||||
|
||||
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
|
||||
@ -88,9 +88,9 @@ diff -up cups-1.6.2/cups/usersys.c.systemd-socket cups-1.6.2/cups/usersys.c
|
||||
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
|
||||
else
|
||||
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
|
||||
diff -up cups-1.6.2/data/cups.path.in.systemd-socket cups-1.6.2/data/cups.path.in
|
||||
--- cups-1.6.2/data/cups.path.in.systemd-socket 2013-03-18 18:53:53.770961616 +0100
|
||||
+++ cups-1.6.2/data/cups.path.in 2013-03-18 18:53:53.770961616 +0100
|
||||
diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
|
||||
--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
|
||||
+++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200
|
||||
@@ -0,0 +1,8 @@
|
||||
+[Unit]
|
||||
+Description=CUPS Printer Service Spool
|
||||
@ -100,9 +100,9 @@ diff -up cups-1.6.2/data/cups.path.in.systemd-socket cups-1.6.2/data/cups.path.i
|
||||
+
|
||||
+[Install]
|
||||
+WantedBy=multi-user.target
|
||||
diff -up cups-1.6.2/data/cups.service.in.systemd-socket cups-1.6.2/data/cups.service.in
|
||||
--- cups-1.6.2/data/cups.service.in.systemd-socket 2013-03-18 18:53:53.770961616 +0100
|
||||
+++ cups-1.6.2/data/cups.service.in 2013-03-18 18:53:53.770961616 +0100
|
||||
diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
|
||||
--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
|
||||
+++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
|
||||
@@ -0,0 +1,10 @@
|
||||
+[Unit]
|
||||
+Description=CUPS Printing Service
|
||||
@ -114,9 +114,9 @@ diff -up cups-1.6.2/data/cups.service.in.systemd-socket cups-1.6.2/data/cups.ser
|
||||
+[Install]
|
||||
+Also=cups.socket cups.path
|
||||
+WantedBy=printer.target
|
||||
diff -up cups-1.6.2/data/cups.socket.in.systemd-socket cups-1.6.2/data/cups.socket.in
|
||||
--- cups-1.6.2/data/cups.socket.in.systemd-socket 2013-03-18 18:53:53.770961616 +0100
|
||||
+++ cups-1.6.2/data/cups.socket.in 2013-03-18 18:53:53.770961616 +0100
|
||||
diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
|
||||
--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
|
||||
+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
|
||||
@@ -0,0 +1,8 @@
|
||||
+[Unit]
|
||||
+Description=CUPS Printing Service Sockets
|
||||
@ -126,9 +126,9 @@ diff -up cups-1.6.2/data/cups.socket.in.systemd-socket cups-1.6.2/data/cups.sock
|
||||
+
|
||||
+[Install]
|
||||
+WantedBy=sockets.target
|
||||
diff -up cups-1.6.2/data/Makefile.systemd-socket cups-1.6.2/data/Makefile
|
||||
--- cups-1.6.2/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200
|
||||
+++ cups-1.6.2/data/Makefile 2013-03-18 18:53:53.770961616 +0100
|
||||
diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
|
||||
--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
|
||||
+++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200
|
||||
@@ -100,6 +100,12 @@ install-data:
|
||||
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
|
||||
done
|
||||
@ -152,10 +152,10 @@ diff -up cups-1.6.2/data/Makefile.systemd-socket cups-1.6.2/data/Makefile
|
||||
|
||||
|
||||
#
|
||||
diff -up cups-1.6.2/Makedefs.in.systemd-socket cups-1.6.2/Makedefs.in
|
||||
--- cups-1.6.2/Makedefs.in.systemd-socket 2013-03-18 18:53:53.758961783 +0100
|
||||
+++ cups-1.6.2/Makedefs.in 2013-03-18 18:53:53.771961602 +0100
|
||||
@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
|
||||
diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
|
||||
--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200
|
||||
+++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200
|
||||
@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
|
||||
CXXLIBS = @CXXLIBS@
|
||||
DBUS_NOTIFIER = @DBUS_NOTIFIER@
|
||||
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
|
||||
@ -163,13 +163,15 @@ diff -up cups-1.6.2/Makedefs.in.systemd-socket cups-1.6.2/Makedefs.in
|
||||
DNSSD_BACKEND = @DNSSD_BACKEND@
|
||||
DSOFLAGS = -L../cups @DSOFLAGS@
|
||||
DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
|
||||
DNSSDLIBS = @DNSSDLIBS@
|
||||
@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@
|
||||
IPPFIND_BIN = @IPPFIND_BIN@
|
||||
IPPFIND_MAN = @IPPFIND_MAN@
|
||||
LAUNCHDLIBS = @LAUNCHDLIBS@
|
||||
+SDLIBS = @SDLIBS@
|
||||
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
||||
-L../scheduler @LDARCHFLAGS@ \
|
||||
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
||||
@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@
|
||||
@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@
|
||||
|
||||
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
|
||||
DBUSDIR = @DBUSDIR@
|
||||
@ -177,9 +179,9 @@ diff -up cups-1.6.2/Makedefs.in.systemd-socket cups-1.6.2/Makedefs.in
|
||||
|
||||
|
||||
#
|
||||
diff -up cups-1.6.2/scheduler/client.h.systemd-socket cups-1.6.2/scheduler/client.h
|
||||
--- cups-1.6.2/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100
|
||||
+++ cups-1.6.2/scheduler/client.h 2013-03-18 18:53:53.771961602 +0100
|
||||
diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
|
||||
--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200
|
||||
+++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200
|
||||
@@ -77,6 +77,9 @@ typedef struct
|
||||
int fd; /* File descriptor for this server */
|
||||
http_addr_t address; /* Bind address of socket */
|
||||
@ -190,9 +192,9 @@ diff -up cups-1.6.2/scheduler/client.h.systemd-socket cups-1.6.2/scheduler/clien
|
||||
} cupsd_listener_t;
|
||||
|
||||
|
||||
diff -up cups-1.6.2/scheduler/listen.c.systemd-socket cups-1.6.2/scheduler/listen.c
|
||||
--- cups-1.6.2/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200
|
||||
+++ cups-1.6.2/scheduler/listen.c 2013-03-18 18:53:53.771961602 +0100
|
||||
diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
|
||||
--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
|
||||
+++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200
|
||||
@@ -401,7 +401,11 @@ cupsdStopListening(void)
|
||||
lis;
|
||||
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
|
||||
@ -206,9 +208,9 @@ diff -up cups-1.6.2/scheduler/listen.c.systemd-socket cups-1.6.2/scheduler/liste
|
||||
{
|
||||
#ifdef WIN32
|
||||
closesocket(lis->fd);
|
||||
diff -up cups-1.6.2/scheduler/main.c.systemd-socket cups-1.6.2/scheduler/main.c
|
||||
--- cups-1.6.2/scheduler/main.c.systemd-socket 2013-03-18 18:53:53.724962256 +0100
|
||||
+++ cups-1.6.2/scheduler/main.c 2013-03-18 18:53:53.772961588 +0100
|
||||
diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
|
||||
--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
|
||||
+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
|
||||
@@ -26,6 +26,8 @@
|
||||
* launchd_checkin() - Check-in with launchd and collect the listening
|
||||
* fds.
|
||||
@ -239,7 +241,7 @@ diff -up cups-1.6.2/scheduler/main.c.systemd-socket cups-1.6.2/scheduler/main.c
|
||||
static void parent_handler(int sig);
|
||||
static void process_children(void);
|
||||
static void sigchld_handler(int sig);
|
||||
@@ -581,6 +590,13 @@ main(int argc, /* I - Number of comm
|
||||
@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm
|
||||
}
|
||||
#endif /* HAVE_LAUNCHD */
|
||||
|
||||
@ -253,7 +255,7 @@ diff -up cups-1.6.2/scheduler/main.c.systemd-socket cups-1.6.2/scheduler/main.c
|
||||
/*
|
||||
* Startup the server...
|
||||
*/
|
||||
@@ -791,6 +807,15 @@ main(int argc, /* I - Number of comm
|
||||
@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm
|
||||
}
|
||||
#endif /* HAVE_LAUNCHD */
|
||||
|
||||
@ -269,7 +271,7 @@ diff -up cups-1.6.2/scheduler/main.c.systemd-socket cups-1.6.2/scheduler/main.c
|
||||
/*
|
||||
* Startup the server...
|
||||
*/
|
||||
@@ -1552,6 +1577,102 @@ launchd_checkout(void)
|
||||
@@ -1511,6 +1536,102 @@ launchd_checkout(void)
|
||||
}
|
||||
#endif /* HAVE_LAUNCHD */
|
||||
|
||||
@ -372,10 +374,10 @@ diff -up cups-1.6.2/scheduler/main.c.systemd-socket cups-1.6.2/scheduler/main.c
|
||||
|
||||
/*
|
||||
* 'parent_handler()' - Catch USR1/CHLD signals...
|
||||
diff -up cups-1.6.2/scheduler/Makefile.systemd-socket cups-1.6.2/scheduler/Makefile
|
||||
--- cups-1.6.2/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200
|
||||
+++ cups-1.6.2/scheduler/Makefile 2013-03-18 18:53:53.772961588 +0100
|
||||
@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
|
||||
diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
|
||||
--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
|
||||
+++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200
|
||||
@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
|
||||
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
|
||||
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
|
||||
$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
|
||||
@ -384,7 +386,7 @@ diff -up cups-1.6.2/scheduler/Makefile.systemd-socket cups-1.6.2/scheduler/Makef
|
||||
|
||||
cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
|
||||
echo Linking $@...
|
||||
@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
|
||||
@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
|
||||
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
|
||||
../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
|
||||
$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
diff -up cups-1.7b1/cups/globals.c.use-ipp1.1 cups-1.7b1/cups/globals.c
|
||||
--- cups-1.7b1/cups/globals.c.use-ipp1.1 2013-06-26 15:05:54.615238227 +0100
|
||||
+++ cups-1.7b1/cups/globals.c 2013-06-26 15:06:11.662299971 +0100
|
||||
@@ -219,7 +219,7 @@ cups_globals_alloc(void)
|
||||
cg->any_root = 1;
|
||||
cg->expired_certs = 1;
|
||||
cg->expired_root = 1;
|
||||
- cg->server_version = 20;
|
||||
+ cg->server_version = 11;
|
||||
diff -up cups-1.6.3/cups/usersys.c.use-ipp1.1 cups-1.6.3/cups/usersys.c
|
||||
--- cups-1.6.3/cups/usersys.c.use-ipp1.1 2013-07-12 11:41:45.368837618 +0200
|
||||
+++ cups-1.6.3/cups/usersys.c 2013-07-12 11:41:45.391837299 +0200
|
||||
@@ -366,7 +366,7 @@ cupsSetServer(const char *server) /* I -
|
||||
cg->server_version = 22;
|
||||
}
|
||||
else
|
||||
- cg->server_version = 20;
|
||||
+ cg->server_version = 11;
|
||||
|
||||
#ifdef DEBUG
|
||||
/*
|
||||
if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL &&
|
||||
!strchr(port, ']') && isdigit(port[1] & 255))
|
||||
|
||||
24
cups.spec
24
cups.spec
@ -1,7 +1,7 @@
|
||||
%global use_alternatives 1
|
||||
%global lspp 1
|
||||
|
||||
%global prever b1
|
||||
%global prever rc1
|
||||
%global VERSION %{version}%{prever}
|
||||
|
||||
# {_exec_prefix}/lib/cups is correct, even on x86_64.
|
||||
@ -14,7 +14,7 @@ Summary: CUPS printing system
|
||||
Name: cups
|
||||
Epoch: 1
|
||||
Version: 1.7
|
||||
Release: 0.16.%{prever}%{?dist}
|
||||
Release: 0.17.%{prever}%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Daemons
|
||||
Url: http://www.cups.org/
|
||||
@ -58,7 +58,6 @@ Patch24: cups-ricoh-deviceid-oid.patch
|
||||
Patch25: cups-systemd-socket.patch
|
||||
Patch26: cups-lpd-manpage.patch
|
||||
Patch27: cups-avahi-address.patch
|
||||
Patch28: cups-17b1-va_list.patch
|
||||
Patch29: cups-enum-all.patch
|
||||
Patch30: cups-stringpool-setprinterattr.patch
|
||||
Patch31: cups-dymo-deviceid.patch
|
||||
@ -236,8 +235,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
||||
%patch26 -p1 -b .lpd-manpage
|
||||
# Use IP address when resolving DNSSD URIs (bug #948288).
|
||||
%patch27 -p1 -b .avahi-address
|
||||
# do not apply unary exclamation mark to va_list (bug #957737).
|
||||
%patch28 -p1 -b .va_list
|
||||
# Return from cupsEnumDests() once all records have been returned.
|
||||
%patch29 -p1 -b .enum-all
|
||||
# Prevent stringpool damage leading to memory leaks (bug #974048).
|
||||
@ -384,11 +381,6 @@ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3:
|
||||
/^\([^%].*\)/d
|
||||
' > %{name}.lang
|
||||
|
||||
# don't ship Russian web templates because they're broken (#960571, STR #4310)
|
||||
# will be fixed in 1.6.3
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/www/ru
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/cups/templates/ru
|
||||
|
||||
%post
|
||||
%systemd_post %{name}.path %{name}.socket %{name}.service
|
||||
|
||||
@ -532,7 +524,7 @@ rm -f %{cups_serverbin}/backend/smb
|
||||
%dir %{_datadir}/%{name}/www/es
|
||||
%dir %{_datadir}/%{name}/www/fr
|
||||
%dir %{_datadir}/%{name}/www/ja
|
||||
#%%dir %{_datadir}/%{name}/www/ru
|
||||
%dir %{_datadir}/%{name}/www/ru
|
||||
%{_datadir}/%{name}/www/images
|
||||
%{_datadir}/%{name}/www/*.css
|
||||
%doc %{_datadir}/%{name}/www/index.html
|
||||
@ -543,7 +535,7 @@ rm -f %{cups_serverbin}/backend/smb
|
||||
%doc %{_datadir}/%{name}/www/es/index.html
|
||||
%doc %{_datadir}/%{name}/www/fr/index.html
|
||||
%doc %{_datadir}/%{name}/www/ja/index.html
|
||||
#%%doc %{_datadir}/%{name}/www/ru/index.html
|
||||
%doc %{_datadir}/%{name}/www/ru/index.html
|
||||
%{_unitdir}/%{name}.service
|
||||
%{_unitdir}/%{name}.socket
|
||||
%{_unitdir}/%{name}.path
|
||||
@ -576,14 +568,14 @@ rm -f %{cups_serverbin}/backend/smb
|
||||
%dir %{_datadir}/cups/templates/es
|
||||
%dir %{_datadir}/cups/templates/fr
|
||||
%dir %{_datadir}/cups/templates/ja
|
||||
#%%dir %{_datadir}/cups/templates/ru
|
||||
%dir %{_datadir}/cups/templates/ru
|
||||
%{_datadir}/cups/templates/*.tmpl
|
||||
%{_datadir}/cups/templates/ca/*.tmpl
|
||||
%{_datadir}/cups/templates/cs/*.tmpl
|
||||
%{_datadir}/cups/templates/es/*.tmpl
|
||||
%{_datadir}/cups/templates/fr/*.tmpl
|
||||
%{_datadir}/cups/templates/ja/*.tmpl
|
||||
#%%{_datadir}/cups/templates/ru/*.tmpl
|
||||
%{_datadir}/cups/templates/ru/*.tmpl
|
||||
%dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
|
||||
%dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
|
||||
%dir %attr(0755,lp,sys) %{_localstatedir}/log/cups
|
||||
@ -630,12 +622,16 @@ rm -f %{cups_serverbin}/backend/smb
|
||||
|
||||
%files ipptool
|
||||
%{_bindir}/ipptool
|
||||
%{_bindir}/ippfind
|
||||
%dir %{_datadir}/cups/ipptool
|
||||
%{_datadir}/cups/ipptool/*
|
||||
%{_mandir}/man1/ipptool.1.gz
|
||||
%{_mandir}/man5/ipptoolfile.5.gz
|
||||
|
||||
%changelog
|
||||
* Fri Jul 12 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.7-0.17.rc1
|
||||
- 1.7rc1
|
||||
|
||||
* Thu Jul 11 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.16.b1
|
||||
- Avoid sign-extending CRCs for gz decompression (bug #983486).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user