fix space errors in failover patch
This commit is contained in:
parent
dacb3dad16
commit
c9349a3af9
@ -1,6 +1,42 @@
|
||||
diff -up cups-2.3.0/backend/failover.c.failover cups-2.3.0/backend/failover.c
|
||||
--- cups-2.3.0/backend/failover.c.failover 2019-10-07 12:22:17.158626746 +0200
|
||||
+++ cups-2.3.0/backend/failover.c 2019-10-07 12:22:17.158626746 +0200
|
||||
diff --git a/backend/Makefile b/backend/Makefile
|
||||
index 3038682..6642016 100644
|
||||
--- a/backend/Makefile
|
||||
+++ b/backend/Makefile
|
||||
@@ -28,6 +28,7 @@ include ../Makedefs
|
||||
RBACKENDS = \
|
||||
ipp \
|
||||
lpd \
|
||||
+ failover \
|
||||
$(DNSSD_BACKEND)
|
||||
UBACKENDS = \
|
||||
snmp \
|
||||
@@ -51,6 +52,7 @@ LIBOBJS = \
|
||||
OBJS = \
|
||||
ipp.o \
|
||||
lpd.o \
|
||||
+ failover.o \
|
||||
dnssd.o \
|
||||
snmp.o \
|
||||
socket.o \
|
||||
@@ -275,6 +277,13 @@ lpd: lpd.o ../cups/$(LIBCUPS) libbackend.a
|
||||
echo Linking $@...
|
||||
$(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
|
||||
|
||||
+#
|
||||
+# failover
|
||||
+#
|
||||
+
|
||||
+failover: failover.o ../cups/$(LIBCUPS) libbackend.a
|
||||
+ echo Linking $@...
|
||||
+ $(LD_CC) $(LDFLAGS) -o failover failover.o libbackend.a $(LIBS)
|
||||
|
||||
#
|
||||
# snmp
|
||||
diff --git a/backend/failover.c b/backend/failover.c
|
||||
new file mode 100644
|
||||
index 0000000..9affd8f
|
||||
--- /dev/null
|
||||
+++ b/backend/failover.c
|
||||
@@ -0,0 +1,837 @@
|
||||
+/*
|
||||
+ * Failover Backend for the Common UNIX Printing System (CUPS).
|
||||
@ -839,36 +875,3 @@ diff -up cups-2.3.0/backend/failover.c.failover cups-2.3.0/backend/failover.c
|
||||
+ else
|
||||
+ return (NULL);
|
||||
+}
|
||||
diff -up cups-2.3.0/backend/Makefile.failover cups-2.3.0/backend/Makefile
|
||||
--- cups-2.3.0/backend/Makefile.failover 2019-10-07 12:22:17.067627388 +0200
|
||||
+++ cups-2.3.0/backend/Makefile 2019-10-07 12:24:17.046780985 +0200
|
||||
@@ -22,6 +22,7 @@ include ../Makedefs
|
||||
RBACKENDS = \
|
||||
ipp \
|
||||
lpd \
|
||||
+ failover \
|
||||
$(DNSSD_BACKEND)
|
||||
UBACKENDS = \
|
||||
snmp \
|
||||
@@ -45,6 +46,7 @@ LIBOBJS = \
|
||||
OBJS = \
|
||||
ipp.o \
|
||||
lpd.o \
|
||||
+ failover.o \
|
||||
dnssd.o \
|
||||
snmp.o \
|
||||
socket.o \
|
||||
@@ -274,6 +276,13 @@ lpd: lpd.o ../cups/$(LIBCUPS) libbackend
|
||||
$(LD_CC) $(ALL_LDFLAGS) -o lpd lpd.o libbackend.a $(LINKCUPS)
|
||||
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
|
||||
|
||||
+#
|
||||
+# failover
|
||||
+#
|
||||
+
|
||||
+failover: failover.o ../cups/$(LIBCUPS) libbackend.a
|
||||
+ echo Linking $@...
|
||||
+ $(LD_CC) $(ALL_LDFLAGS) -o failover failover.o libbackend.a $(LINKCUPS)
|
||||
|
||||
#
|
||||
# snmp
|
||||
|
@ -15,7 +15,7 @@ Summary: CUPS printing system
|
||||
Name: cups
|
||||
Epoch: 1
|
||||
Version: 2.3.3
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: ASL 2.0 with exceptions for GPL2/LGPL2
|
||||
Url: http://www.cups.org/
|
||||
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
|
||||
@ -747,6 +747,9 @@ rm -f %{cups_serverbin}/backend/smb
|
||||
%{_mandir}/man7/ippevepcl.7.gz
|
||||
|
||||
%changelog
|
||||
* Fri May 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-4
|
||||
- fix space errors in failover patch
|
||||
|
||||
* Thu May 21 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-3
|
||||
- use _rundir instead of hardcode /run
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user