|
 |
66f882d |
diff --git a/configure b/configure
|
|
|
66f882d |
index 6f34f65..e57e603 100755
|
|
|
66f882d |
--- a/configure
|
|
|
66f882d |
+++ b/configure
|
|
|
66f882d |
@@ -9993,7 +9993,7 @@ fi
|
|
|
66f882d |
|
|
|
66f882d |
|
|
|
66f882d |
|
|
|
66f882d |
-ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES"
|
|
|
66f882d |
+ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES"
|
|
|
66f882d |
|
|
|
66f882d |
cat >confcache <<\_ACEOF
|
|
|
66f882d |
# This file is a shell script that caches the results of configure
|
|
|
66f882d |
@@ -10700,10 +10700,10 @@ do
|
|
|
66f882d |
"scheduler/cups.sh") CONFIG_FILES="$CONFIG_FILES scheduler/cups.sh" ;;
|
|
|
66f882d |
"scheduler/cups.xml") CONFIG_FILES="$CONFIG_FILES scheduler/cups.xml" ;;
|
|
|
66f882d |
"scheduler/org.cups.cups-lpd.plist") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cups-lpd.plist" ;;
|
|
|
66f882d |
- "scheduler/org.cups.cups-lpdAT.service") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cups-lpdAT.service" ;;
|
|
|
66f882d |
- "scheduler/org.cups.cupsd.path") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cupsd.path" ;;
|
|
|
66f882d |
- "scheduler/org.cups.cupsd.service") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cupsd.service" ;;
|
|
|
66f882d |
- "scheduler/org.cups.cupsd.socket") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cupsd.socket" ;;
|
|
|
66f882d |
+ "scheduler/cups-lpdAT.service") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpdAT.service" ;;
|
|
|
66f882d |
+ "scheduler/cups.path") CONFIG_FILES="$CONFIG_FILES scheduler/cups.path" ;;
|
|
|
66f882d |
+ "scheduler/cups.service") CONFIG_FILES="$CONFIG_FILES scheduler/cups.service" ;;
|
|
|
66f882d |
+ "scheduler/cups.socket") CONFIG_FILES="$CONFIG_FILES scheduler/cups.socket" ;;
|
|
|
66f882d |
"templates/header.tmpl") CONFIG_FILES="$CONFIG_FILES templates/header.tmpl" ;;
|
|
|
66f882d |
"packaging/cups.list") CONFIG_FILES="$CONFIG_FILES packaging/cups.list" ;;
|
|
|
66f882d |
"$LANGFILES") CONFIG_FILES="$CONFIG_FILES $LANGFILES" ;;
|
|
|
66f882d |
diff --git a/configure.ac b/configure.ac
|
|
|
66f882d |
index 44bf6eb..78b318e 100644
|
|
|
66f882d |
--- a/configure.ac
|
|
|
66f882d |
+++ b/configure.ac
|
|
|
66f882d |
@@ -72,10 +72,10 @@ AC_OUTPUT(Makedefs
|
|
|
66f882d |
scheduler/cups.sh
|
|
|
66f882d |
scheduler/cups.xml
|
|
|
66f882d |
scheduler/org.cups.cups-lpd.plist
|
|
|
66f882d |
- scheduler/org.cups.cups-lpdAT.service
|
|
|
66f882d |
- scheduler/org.cups.cupsd.path
|
|
|
66f882d |
- scheduler/org.cups.cupsd.service
|
|
|
66f882d |
- scheduler/org.cups.cupsd.socket
|
|
|
66f882d |
+ scheduler/cups-lpdAT.service
|
|
|
66f882d |
+ scheduler/cups.path
|
|
|
66f882d |
+ scheduler/cups.service
|
|
|
66f882d |
+ scheduler/cups.socket
|
|
|
66f882d |
templates/header.tmpl
|
|
|
66f882d |
packaging/cups.list
|
|
|
66f882d |
$LANGFILES)
|
|
|
66f882d |
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
|
|
|
66f882d |
index 537c194..a167a99 100644
|
|
|
66f882d |
--- a/packaging/cups.list.in
|
|
|
66f882d |
+++ b/packaging/cups.list.in
|
|
|
66f882d |
@@ -1,6 +1,7 @@
|
|
|
66f882d |
#
|
|
|
66f882d |
# ESP Package Manager (EPM) file list for CUPS.
|
|
|
66f882d |
#
|
|
|
66f882d |
+# Copyright © 2020 by Michael R Sweet
|
|
|
66f882d |
# Copyright © 2007-2019 by Apple Inc.
|
|
|
66f882d |
# Copyright © 1997-2007 by Easy Software Products, all rights reserved.
|
|
|
66f882d |
#
|
|
|
66f882d |
@@ -10,8 +11,8 @@
|
|
|
66f882d |
|
|
|
66f882d |
# Product information
|
|
|
66f882d |
%product CUPS
|
|
|
66f882d |
-%copyright 2007-2019 by Apple Inc.
|
|
|
66f882d |
-%vendor Apple Inc.
|
|
|
66f882d |
+%copyright 2020 by Michael R Sweet, 2007-2019 by Apple Inc.
|
|
|
66f882d |
+%vendor OpenPrinting
|
|
|
66f882d |
#%license LICENSE
|
|
|
66f882d |
%readme LICENSE
|
|
|
66f882d |
%format rpm
|
|
|
66f882d |
@@ -20,8 +21,9 @@
|
|
|
66f882d |
%format !rpm
|
|
|
66f882d |
%version @CUPS_VERSION@
|
|
|
66f882d |
%format all
|
|
|
66f882d |
-%description CUPS is the standards-based, open source printing system developed by
|
|
|
66f882d |
-%description Apple Inc. for macOS® and other UNIX®-like operating systems.
|
|
|
66f882d |
+%description CUPS is the standards-based, open source printing system developed
|
|
|
66f882d |
+%description by Apple Inc. and maintained by OpenPrinting for macOS® and other
|
|
|
66f882d |
+%description UNIX®-like operating systems.
|
|
|
66f882d |
|
|
|
66f882d |
%format rpm
|
|
|
66f882d |
%provides lpd
|
|
|
66f882d |
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
|
|
|
66f882d |
index d37103c..59caee0 100644
|
|
|
66f882d |
--- a/packaging/cups.spec.in
|
|
|
66f882d |
+++ b/packaging/cups.spec.in
|
|
|
66f882d |
@@ -3,6 +3,7 @@
|
|
|
66f882d |
#
|
|
|
66f882d |
# Original version by Jason McMullan <jmcc@ontv.com>.
|
|
|
66f882d |
#
|
|
|
66f882d |
+# Copyright © 2020 by Michael R Sweet
|
|
|
66f882d |
# Copyright © 2007-2019 by Apple Inc.
|
|
|
66f882d |
# Copyright © 1999-2007 by Easy Software Products, all rights reserved.
|
|
|
66f882d |
#
|
|
|
66f882d |
@@ -48,7 +49,7 @@ Group: System Environment/Daemons
|
|
|
66f882d |
Source: https://github.com/apple/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
|
|
|
66f882d |
Url: http://www.cups.org
|
|
|
66f882d |
Packager: Anonymous <anonymous@example.com>
|
|
|
66f882d |
-Vendor: Example Corp
|
|
|
66f882d |
+Vendor: OpenPrinting
|
|
|
66f882d |
|
|
|
66f882d |
# Package names are as defined for Red Hat (and clone) distributions
|
|
|
66f882d |
BuildRequires: gnutls-devel, pam-devel
|
|
|
66f882d |
@@ -97,7 +98,8 @@ Requires: %{name} = %{epoch}:%{version} xinetd
|
|
|
66f882d |
|
|
|
66f882d |
%description
|
|
|
66f882d |
CUPS is the standards-based, open source printing system developed by
|
|
|
66f882d |
-Apple Inc. for macOS® and other UNIX®-like operating systems.
|
|
|
66f882d |
+Apple Inc. and maintained by OpenPrinting for macOS® and other UNIX®-like
|
|
|
66f882d |
+operating systems.
|
|
|
66f882d |
|
|
|
66f882d |
%description devel
|
|
|
66f882d |
This package provides the CUPS headers and development environment.
|
|
|
66f882d |
@@ -126,11 +128,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
|
|
|
66f882d |
|
|
|
66f882d |
%post
|
|
|
66f882d |
%if %{?_with_systemd:1}%{!?_with_systemd:0}
|
|
|
66f882d |
-/bin/systemctl enable org.cups.cupsd.service
|
|
|
66f882d |
+/bin/systemctl enable cups.service
|
|
|
66f882d |
|
|
|
66f882d |
if test $1 -ge 1; then
|
|
|
66f882d |
- /bin/systemctl stop org.cups.cupsd.service
|
|
|
66f882d |
- /bin/systemctl start org.cups.cupsd.service
|
|
|
66f882d |
+ /bin/systemctl stop cups.service
|
|
|
66f882d |
+ /bin/systemctl start cups.service
|
|
|
66f882d |
fi
|
|
|
66f882d |
|
|
|
66f882d |
%else
|
|
|
66f882d |
@@ -150,8 +152,8 @@ fi
|
|
|
66f882d |
%preun
|
|
|
66f882d |
%if %{?_with_systemd:1}%{!?_with_systemd:0}
|
|
|
66f882d |
if test $1 -ge 1; then
|
|
|
66f882d |
- /bin/systemctl stop org.cups.cupsd.service
|
|
|
66f882d |
- /bin/systemctl disable org.cups.cupsd.service
|
|
|
66f882d |
+ /bin/systemctl stop cups.service
|
|
|
66f882d |
+ /bin/systemctl disable cups.service
|
|
|
66f882d |
fi
|
|
|
66f882d |
|
|
|
66f882d |
%else
|
|
|
66f882d |
@@ -164,8 +166,8 @@ fi
|
|
|
66f882d |
%postun
|
|
|
66f882d |
%if %{?_with_systemd:1}%{!?_with_systemd:0}
|
|
|
66f882d |
if test $1 -ge 1; then
|
|
|
66f882d |
- /bin/systemctl stop org.cups.cupsd.service
|
|
|
66f882d |
- /bin/systemctl start org.cups.cupsd.service
|
|
|
66f882d |
+ /bin/systemctl stop cups.service
|
|
|
66f882d |
+ /bin/systemctl start cups.service
|
|
|
66f882d |
fi
|
|
|
66f882d |
|
|
|
66f882d |
%else
|
|
|
66f882d |
@@ -203,7 +205,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
66f882d |
|
|
|
66f882d |
%if %{?_with_systemd:1}%{!?_with_systemd:0}
|
|
|
66f882d |
# SystemD
|
|
|
66f882d |
-/usr/lib/systemd/system/org.cups.cupsd.*
|
|
|
66f882d |
+/usr/lib/systemd/system/cups.*
|
|
|
66f882d |
|
|
|
66f882d |
%else
|
|
|
66f882d |
# Legacy init support on Linux
|
|
|
66f882d |
@@ -425,7 +427,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
66f882d |
%defattr(-,root,root)
|
|
|
66f882d |
%if %{?_with_systemd:1}%{!?_with_systemd:0}
|
|
|
66f882d |
# SystemD
|
|
|
66f882d |
-/usr/lib/systemd/system/org.cups.cups-lpd*
|
|
|
66f882d |
+/usr/lib/systemd/system/cups-lpd*
|
|
|
66f882d |
%else
|
|
|
66f882d |
# Legacy xinetd
|
|
|
66f882d |
/etc/xinetd.d/cups-lpd
|
|
|
66f882d |
diff --git a/scheduler/Makefile b/scheduler/Makefile
|
|
|
66f882d |
index b50bd0a..a9b6ad6 100644
|
|
|
66f882d |
--- a/scheduler/Makefile
|
|
|
66f882d |
+++ b/scheduler/Makefile
|
|
|
66f882d |
@@ -194,11 +194,11 @@ install-data:
|
|
|
66f882d |
if test "x$(SYSTEMD_DIR)" != x; then \
|
|
|
66f882d |
echo Installing systemd configuration files...; \
|
|
|
66f882d |
$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
- $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
- $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
- $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
- $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
|
|
|
66f882d |
- $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
+ $(INSTALL_DATA) cups.path $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
+ $(INSTALL_DATA) cups.service $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
+ $(INSTALL_DATA) cups.socket $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
+ $(INSTALL_DATA) cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
|
|
|
66f882d |
+ $(INSTALL_DATA) cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
|
|
|
66f882d |
elif test "x$(XINETD)" != x; then \
|
|
|
66f882d |
echo Installing xinetd configuration file for cups-lpd...; \
|
|
|
66f882d |
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
|
|
|
66f882d |
@@ -294,9 +294,9 @@ uninstall:
|
|
|
66f882d |
fi
|
|
|
66f882d |
if test "x$SYSTEMD_DIR" != x; then \
|
|
|
66f882d |
echo Uninstalling systemd files...; \
|
|
|
66f882d |
- $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.path; \
|
|
|
66f882d |
- $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.service; \
|
|
|
66f882d |
- $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.socket; \
|
|
|
66f882d |
+ $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
|
|
|
66f882d |
+ $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
|
|
|
66f882d |
+ $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
|
|
|
66f882d |
fi
|
|
|
66f882d |
if test "x$(SMFMANIFESTDIR)" != x; then \
|
|
|
66f882d |
echo Uninstalling SMF manifest file...;\
|
|
|
66f882d |
diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/cups-lpd.socket
|
|
|
66f882d |
similarity index 77%
|
|
|
66f882d |
rename from scheduler/org.cups.cups-lpd.socket
|
|
|
66f882d |
rename to scheduler/cups-lpd.socket
|
|
|
66f882d |
index ed23f9d..eb84459 100644
|
|
|
66f882d |
--- a/scheduler/org.cups.cups-lpd.socket
|
|
|
66f882d |
+++ b/scheduler/cups-lpd.socket
|
|
|
66f882d |
@@ -1,6 +1,6 @@
|
|
|
66f882d |
[Unit]
|
|
|
66f882d |
Description=CUPS LPD Server Socket
|
|
|
66f882d |
-PartOf=org.cups.cups-lpd.service
|
|
|
66f882d |
+PartOf=cups-lpd.service
|
|
|
66f882d |
|
|
|
66f882d |
[Socket]
|
|
|
66f882d |
ListenStream=515
|
|
|
66f882d |
diff --git a/scheduler/org.cups.cups-lpdAT.service.in b/scheduler/cups-lpdAT.service.in
|
|
|
66f882d |
similarity index 100%
|
|
|
66f882d |
rename from scheduler/org.cups.cups-lpdAT.service.in
|
|
|
66f882d |
rename to scheduler/cups-lpdAT.service.in
|
|
|
66f882d |
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/cups.path.in
|
|
|
66f882d |
similarity index 80%
|
|
|
66f882d |
rename from scheduler/org.cups.cupsd.path.in
|
|
|
66f882d |
rename to scheduler/cups.path.in
|
|
|
66f882d |
index 0f1cc46..7c8509f 100644
|
|
|
66f882d |
--- a/scheduler/org.cups.cupsd.path.in
|
|
|
66f882d |
+++ b/scheduler/cups.path.in
|
|
|
66f882d |
@@ -1,6 +1,6 @@
|
|
|
66f882d |
[Unit]
|
|
|
66f882d |
Description=CUPS Scheduler
|
|
|
66f882d |
-PartOf=org.cups.cupsd.service
|
|
|
66f882d |
+PartOf=cups.service
|
|
|
66f882d |
|
|
|
66f882d |
[Path]
|
|
|
66f882d |
PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
|
|
|
66f882d |
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/cups.service.in
|
|
|
66f882d |
similarity index 79%
|
|
|
66f882d |
rename from scheduler/org.cups.cupsd.service.in
|
|
|
66f882d |
rename to scheduler/cups.service.in
|
|
|
66f882d |
index 5273762..cd23343 100644
|
|
|
66f882d |
--- a/scheduler/org.cups.cupsd.service.in
|
|
|
66f882d |
+++ b/scheduler/cups.service.in
|
|
|
66f882d |
@@ -9,5 +9,5 @@ Type=simple
|
|
|
66f882d |
Restart=on-failure
|
|
|
66f882d |
|
|
|
66f882d |
[Install]
|
|
|
66f882d |
-Also=org.cups.cupsd.socket org.cups.cupsd.path
|
|
|
66f882d |
+Also=cups.socket cups.path
|
|
|
66f882d |
WantedBy=printer.target
|
|
|
66f882d |
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/cups.socket.in
|
|
|
66f882d |
similarity index 80%
|
|
|
66f882d |
rename from scheduler/org.cups.cupsd.socket.in
|
|
|
66f882d |
rename to scheduler/cups.socket.in
|
|
|
66f882d |
index 613b977..3c37d72 100644
|
|
|
66f882d |
--- a/scheduler/org.cups.cupsd.socket.in
|
|
|
66f882d |
+++ b/scheduler/cups.socket.in
|
|
|
66f882d |
@@ -1,6 +1,6 @@
|
|
|
66f882d |
[Unit]
|
|
|
66f882d |
Description=CUPS Scheduler
|
|
|
66f882d |
-PartOf=org.cups.cupsd.service
|
|
|
66f882d |
+PartOf=cups.service
|
|
|
66f882d |
|
|
|
66f882d |
[Socket]
|
|
|
66f882d |
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
|