rpms/cups/F-10 cups.spec,1.460,1.461
Tim Waugh
twaugh at fedoraproject.org
Mon Apr 27 15:42:17 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1965
Modified Files:
cups.spec
Log Message:
* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
- Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
(part of bug #497301). The default cupsd.conf now includes this
line as well.
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- cups.spec 26 Apr 2009 12:19:29 -0000 1.460
+++ cups.spec 27 Apr 2009 15:41:46 -0000 1.461
@@ -7,7 +7,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.3.10
-Release: 2%{?svn:.svn%{svn}}%{?dist}
+Release: 3%{?svn:.svn%{svn}}%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -292,6 +292,16 @@
# Handle https:// device URIs (bug #478677, STR #3122).
ln -s ipp $RPM_BUILD_ROOT%{cups_serverbin}/backend/https
+# Disable Host: checking by default for compatibility. The
+# ServerAlias directive was added in 1.3.10.
+cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd.conf
+
+# You should list each hostname alias used for this server so that it
+# can verify the correct name is used for it. Using "ServerAlias *"
+# disables checking.
+ServerAlias *
+EOF
+
# Remove unshipped files.
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -353,6 +363,21 @@
fi
exit 0
+%triggerpostun -- %{name} < 1:1.3.10-3
+if [ "$1" -gt 0 ]; then
+ CONF=%{_sysconfdir}/cups/cupsd.conf
+ if ! grep -q ServerAlias "$CONF"; then
+ cp -a "$CONF" "$CONF".rpmorig
+ cat <<"EOF" >> "$CONF"
+
+# You should list each hostname alias used for this server so that it
+# can verify the correct name is used for it. Using "ServerAlias *"
+# disables checking.
+ServerAlias *
+EOF
+ fi
+fi
+
%triggerin -- samba-client
ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || :
exit 0
@@ -480,6 +505,11 @@
%{_libdir}/php/modules/*.so
%changelog
+* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
+- Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
+ (part of bug #497301). The default cupsd.conf now includes this
+ line as well.
+
* Sun Apr 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-2
- Accept "Host: ::1" (bug #497393).
- Accept Host: fields set to the ServerName value (bug #497301).
More information about the fedora-extras-commits
mailing list