auto-import cups-1.1.17-13 from cups-1.1.17-13.src.rpm
This commit is contained in:
parent
9f6e0fbad9
commit
0519732745
23
cups-1.1.16-system-auth.patch
Normal file
23
cups-1.1.16-system-auth.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
only in patch2:
|
||||||
|
--- cups-1.1.16/conf/cups.system-auth 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ cups-1.1.16/conf/cups.system-auth 2002-11-20 12:44:44.000000000 +0000
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+#%PAM-1.0
|
||||||
|
+auth required pam_stack.so service=system-auth
|
||||||
|
+account required pam_stack.so service=system-auth
|
||||||
|
only in patch2:
|
||||||
|
--- cups-1.1.16/conf/Makefile.system-auth 2002-11-20 12:45:05.000000000 +0000
|
||||||
|
+++ cups-1.1.16/conf/Makefile 2002-11-20 12:47:23.000000000 +0000
|
||||||
|
@@ -67,7 +67,11 @@
|
||||||
|
done
|
||||||
|
-if test x$(PAMDIR) != x$(BUILDROOT); then \
|
||||||
|
$(INSTALL_DIR) $(PAMDIR); \
|
||||||
|
- $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
|
||||||
|
+ if test -f /etc/pam.d/system-auth; then \
|
||||||
|
+ $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \
|
||||||
|
+ else \
|
||||||
|
+ $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
|
||||||
|
+ fi \
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
2
cups-lpd
2
cups-lpd
@ -7,5 +7,5 @@ service printer
|
|||||||
protocol = tcp
|
protocol = tcp
|
||||||
wait = no
|
wait = no
|
||||||
user = lp
|
user = lp
|
||||||
server = /usr/lib/cups/daemon/cups-lpd
|
server = @LIBDIR@/cups/daemon/cups-lpd
|
||||||
}
|
}
|
||||||
|
33
cups.init
33
cups.init
@ -42,9 +42,23 @@ fi
|
|||||||
|
|
||||||
DAEMON=cupsd
|
DAEMON=cupsd
|
||||||
|
|
||||||
|
prog=cups
|
||||||
|
|
||||||
|
config () {
|
||||||
|
# Is this a printconf system?
|
||||||
|
if [ -x /usr/sbin/printconf-backend ]
|
||||||
|
then
|
||||||
|
# run printconf-backend to set up the configuration.
|
||||||
|
/usr/sbin/printconf-backend
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
start () {
|
start () {
|
||||||
|
echo -n $"Starting $prog: "
|
||||||
|
|
||||||
|
config
|
||||||
|
|
||||||
# start daemon
|
# start daemon
|
||||||
echo -n "Starting cupsd: "
|
|
||||||
daemon $DAEMON
|
daemon $DAEMON
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
echo
|
echo
|
||||||
@ -54,7 +68,7 @@ start () {
|
|||||||
|
|
||||||
stop () {
|
stop () {
|
||||||
# stop daemon
|
# stop daemon
|
||||||
echo -n "Stopping cups: "
|
echo -n "Stopping $prog: "
|
||||||
killproc $DAEMON
|
killproc $DAEMON
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
echo
|
echo
|
||||||
@ -79,12 +93,25 @@ case $1 in
|
|||||||
condrestart)
|
condrestart)
|
||||||
[ -f /var/lock/subsys/cups ] && restart || :
|
[ -f /var/lock/subsys/cups ] && restart || :
|
||||||
;;
|
;;
|
||||||
|
reload)
|
||||||
|
echo -n $"Reloading $prog: "
|
||||||
|
config
|
||||||
|
killproc $DAEMON -HUP
|
||||||
|
RETVAL=$?
|
||||||
|
echo
|
||||||
|
if [ $RETVAL -ne 0 ]
|
||||||
|
then
|
||||||
|
# Rebuild ppds.dat file if the daemon wasn't
|
||||||
|
# there to do it.
|
||||||
|
$DAEMON --ppdsdat
|
||||||
|
fi
|
||||||
|
;;
|
||||||
status)
|
status)
|
||||||
status $DAEMON
|
status $DAEMON
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
||||||
echo "Usage: $DAEMON {start|stop|restart|status|condrestart}"
|
echo "Usage: $DAEMON {start|stop|restart|condrestart|reload|status}"
|
||||||
exit 1
|
exit 1
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
8
cups.logrotate
Normal file
8
cups.logrotate
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/var/log/cups/*_log {
|
||||||
|
missingok
|
||||||
|
notifempty
|
||||||
|
sharedscripts
|
||||||
|
postrotate
|
||||||
|
/etc/init.d/cups condrestart >/dev/null 2>&1 || true
|
||||||
|
endscript
|
||||||
|
}
|
199
cups.spec
199
cups.spec
@ -1,39 +1,38 @@
|
|||||||
%define initdir /etc/rc.d/init.d
|
%define initdir /etc/rc.d/init.d
|
||||||
%define patchlevel %{nil}
|
|
||||||
%define use_alternatives 1
|
%define use_alternatives 1
|
||||||
|
|
||||||
Summary: Common Unix Printing System
|
Summary: Common Unix Printing System
|
||||||
Name: cups
|
Name: cups
|
||||||
Version: 1.1.17
|
Version: 1.1.17
|
||||||
Release: 0.9
|
Release: 13
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
%if "%{patchlevel}" != ""
|
|
||||||
Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-%{patchlevel}-source.tar.bz2
|
|
||||||
%else
|
|
||||||
Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2
|
Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2
|
||||||
%endif
|
|
||||||
Source1: cups.init
|
Source1: cups.init
|
||||||
Source2: cupsprinter.png
|
Source2: cupsprinter.png
|
||||||
Source3: cups.desktop
|
|
||||||
Source4: cupsconfig
|
Source4: cupsconfig
|
||||||
Source5: cups-lpd
|
Source5: cups-lpd
|
||||||
Source6: pstoraster
|
Source6: pstoraster
|
||||||
Source7: pstoraster.convs
|
Source7: pstoraster.convs
|
||||||
Source8: postscript.ppd.gz
|
Source8: postscript.ppd.gz
|
||||||
Patch: cups-1.1.15-initscript.patch
|
Source9: cups.logrotate
|
||||||
|
Source10: ncp.backend
|
||||||
|
Patch0: cups-1.1.15-initscript.patch
|
||||||
Patch1: cups-1.1.14-doclink.patch
|
Patch1: cups-1.1.14-doclink.patch
|
||||||
Patch2: cups-1.1.17-uninit.patch
|
Patch2: cups-1.1.16-system-auth.patch
|
||||||
Patch3: cups-idefense-v2.patch
|
Patch3: cups-1.1.17-backend.patch
|
||||||
Patch4: cups-1.1.17-pdftops.patch
|
Patch4: cups-1.1.17-uninit.patch
|
||||||
Patch5: cups-1.1.18-str75.patchv2
|
Patch5: cups-idefense-v2.patch
|
||||||
Patch6: cups-1.1.17-loop.patch
|
Patch6: cups-1.1.17-pdftops.patch
|
||||||
Patch7: cups-1.1.17-lpd.patch
|
Patch7: cups-1.1.17-error.patch
|
||||||
|
Patch8: cups-1.1.17-rcp.patch
|
||||||
|
Patch9: cups-1.1.17-ppdsdat.patch
|
||||||
|
Patch10: cups-1.1.17-sigchld.patch
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Url: http://www.cups.org/
|
Url: http://www.cups.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-root
|
||||||
PreReq: /sbin/chkconfig /sbin/service
|
PreReq: /sbin/chkconfig /sbin/service
|
||||||
Requires: %{name}-libs = %{version} htmlview xinetd
|
Requires: %{name}-libs = %{epoch}:%{version} htmlview xinetd
|
||||||
%if %use_alternatives
|
%if %use_alternatives
|
||||||
Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
|
Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
|
||||||
Prereq: /usr/sbin/alternatives
|
Prereq: /usr/sbin/alternatives
|
||||||
@ -41,11 +40,12 @@ Prereq: /usr/sbin/alternatives
|
|||||||
Obsoletes: lpd lpr LPRng printconf printconf-gui printconf-tui printtool
|
Obsoletes: lpd lpr LPRng printconf printconf-gui printconf-tui printtool
|
||||||
Provides: lpd lpr LPRng
|
Provides: lpd lpr LPRng
|
||||||
%endif
|
%endif
|
||||||
|
BuildPrereq: pam-devel XFree86-devel openssl-devel pkgconfig
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Common Unix Printing System - development environment
|
Summary: Common Unix Printing System - development environment
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name}-libs = %{version}
|
Requires: %{name}-libs = %{epoch}:%{version}
|
||||||
|
|
||||||
%package libs
|
%package libs
|
||||||
Summary: Common Unix Printing System - libraries
|
Summary: Common Unix Printing System - libraries
|
||||||
@ -72,25 +72,35 @@ natively, without needing the lp/lpr commands.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -p1 -b .noinit
|
%patch0 -p1 -b .noinit
|
||||||
%patch1 -p1 -b .doclink
|
%patch1 -p1 -b .doclink
|
||||||
%patch2 -p1 -b .uninit
|
%patch2 -p1 -b .system-auth
|
||||||
%patch3 -p0 -b .security
|
%patch3 -p1 -b .backend
|
||||||
%patch4 -p1 -b .pdftops
|
%patch4 -p1 -b .uninit
|
||||||
%patch5 -p1 -b .str75
|
%patch5 -p0 -b .security
|
||||||
%patch6 -p1 -b .loop
|
%patch6 -p1 -b .pdftops
|
||||||
%patch7 -p1 -b .lpd
|
%patch7 -p1 -b .error
|
||||||
|
%patch8 -p1 -b .rcp
|
||||||
|
%patch9 -p1 -b .ppdsdat
|
||||||
|
%patch10 -p1 -b .sigchld
|
||||||
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
|
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
|
||||||
|
perl -pi -e 's,^#(MaxLogSize\s+0),$1,' conf/cupsd.conf.in
|
||||||
autoconf
|
autoconf
|
||||||
|
|
||||||
|
cp %{SOURCE5} cups-lpd.real
|
||||||
|
perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --sysconfdir=/etc \
|
if pkg-config openssl ; then
|
||||||
--with-docdir=%{_docdir}/cups-%{version} \
|
export CFLAGS=`pkg-config --cflags openssl`
|
||||||
--mandir=%{_mandir}
|
export CPPFLAGS=`pkg-config --cflags-only-I openssl`
|
||||||
|
export LDFLAGS=`pkg-config --libs-only-L openssl`
|
||||||
|
fi
|
||||||
|
%configure --with-docdir=%{_docdir}/cups-%{version}
|
||||||
perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs
|
perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs
|
||||||
|
|
||||||
# If we got this far, all prerequisite libraries must be here.
|
# If we got this far, all prerequisite libraries must be here.
|
||||||
make OPTIM="$RPM_OPT_FLAGS -fpic"
|
make OPTIM="$RPM_OPT_FLAGS $CFLAGS -fpic"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -103,7 +113,7 @@ install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{initdir}/cups
|
|||||||
find $RPM_BUILD_ROOT/usr/share/cups/model -name "*.ppd" |xargs gzip -9f
|
find $RPM_BUILD_ROOT/usr/share/cups/model -name "*.ppd" |xargs gzip -9f
|
||||||
|
|
||||||
%if %use_alternatives
|
%if %use_alternatives
|
||||||
cd $RPM_BUILD_ROOT%{_bindir}
|
pushd $RPM_BUILD_ROOT%{_bindir}
|
||||||
for i in cancel lp lpq lpr lprm lpstat; do
|
for i in cancel lp lpq lpr lprm lpstat; do
|
||||||
mv $i $i.cups
|
mv $i $i.cups
|
||||||
done
|
done
|
||||||
@ -115,14 +125,15 @@ for i in cancel lp lpq lpr lprm lpstat; do
|
|||||||
done
|
done
|
||||||
cd $RPM_BUILD_ROOT%{_mandir}/man8
|
cd $RPM_BUILD_ROOT%{_mandir}/man8
|
||||||
mv lpc.8 lpc-cups.8
|
mv lpc.8 lpc-cups.8
|
||||||
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
|
||||||
install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||||
install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig
|
|
||||||
install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
|
|
||||||
install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}
|
install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}
|
||||||
install -c -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
|
install -c -m 755 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
|
||||||
|
install -c -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
|
||||||
|
install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp
|
||||||
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
|
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
|
||||||
# Deal with users trying to access the admin tool at
|
# Deal with users trying to access the admin tool at
|
||||||
# /usr/share/doc/cups-%{version}/index.html rather than the
|
# /usr/share/doc/cups-%{version}/index.html rather than the
|
||||||
@ -149,10 +160,6 @@ If your browser does not support redirection, please use
|
|||||||
EOF
|
EOF
|
||||||
done
|
done
|
||||||
|
|
||||||
# Remove unshipped files.
|
|
||||||
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? \
|
|
||||||
$RPM_BUILD_ROOT%{_mandir}/fr
|
|
||||||
|
|
||||||
# Ship pstoraster (bug #69573).
|
# Ship pstoraster (bug #69573).
|
||||||
install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter
|
install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter
|
||||||
install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
|
install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
|
||||||
@ -160,11 +167,14 @@ install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
|
|||||||
# Ship a generic postscript PPD file (#73061)
|
# Ship a generic postscript PPD file (#73061)
|
||||||
install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
|
install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
|
||||||
|
|
||||||
|
# Remove unshipped files.
|
||||||
|
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
|
/sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
|
||||||
/sbin/chkconfig --add cups || true
|
/sbin/chkconfig --add cups || true
|
||||||
%if %use_alternatives
|
%if %use_alternatives
|
||||||
/usr/sbin/alternatives --install %{_bindir}/lpr print %{_bindir}/lpr.cups 20 \
|
/usr/sbin/alternatives --install %{_bindir}/lpr print %{_bindir}/lpr.cups 40 \
|
||||||
--slave %{_bindir}/lp print-lp %{_bindir}/lp.cups \
|
--slave %{_bindir}/lp print-lp %{_bindir}/lp.cups \
|
||||||
--slave %{_bindir}/lpq print-lpq %{_bindir}/lpq.cups \
|
--slave %{_bindir}/lpq print-lpq %{_bindir}/lpq.cups \
|
||||||
--slave %{_bindir}/lprm print-lprm %{_bindir}/lprm.cups \
|
--slave %{_bindir}/lprm print-lprm %{_bindir}/lprm.cups \
|
||||||
@ -180,6 +190,10 @@ install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
|
|||||||
--slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz \
|
--slave %{_mandir}/man1/lpstat.1.gz print-lpstatman %{_mandir}/man1/lpstat-cups.1.gz \
|
||||||
--initscript cups
|
--initscript cups
|
||||||
%endif
|
%endif
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
# First install. Build ppds.dat.
|
||||||
|
/sbin/service cups reload >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
%post libs -p /sbin/ldconfig
|
||||||
@ -215,13 +229,16 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir /etc/cups
|
%dir %attr(0755,lp,sys) /etc/cups
|
||||||
/etc/cups/certs
|
%dir %attr(0711,lp,sys) /etc/cups/certs
|
||||||
%config /etc/cups/*.conf
|
%config(noreplace) %attr(0600,lp,sys) /etc/cups/classes.conf
|
||||||
|
%config(noreplace) %attr(0600,lp,sys) /etc/cups/cupsd.conf
|
||||||
|
%config(noreplace) %attr(0600,lp,sys) /etc/cups/printers.conf
|
||||||
|
%config(noreplace) /etc/cups/client.conf
|
||||||
/etc/cups/interfaces
|
/etc/cups/interfaces
|
||||||
/etc/cups/mime.types
|
/etc/cups/mime.types
|
||||||
/etc/cups/mime.convs
|
/etc/cups/mime.convs
|
||||||
/etc/cups/ppd
|
%dir %attr(0755,lp,sys) /etc/cups/ppd
|
||||||
/etc/cups/pstoraster.convs
|
/etc/cups/pstoraster.convs
|
||||||
/etc/pam.d/cups
|
/etc/pam.d/cups
|
||||||
%doc %{_docdir}/cups-%{version}
|
%doc %{_docdir}/cups-%{version}
|
||||||
@ -233,15 +250,15 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_bindir}/lp*
|
%{_bindir}/lp*
|
||||||
%{_libdir}/cups
|
%{_libdir}/cups
|
||||||
%{_mandir}/man?/*
|
%{_mandir}/man?/*
|
||||||
|
%{_mandir}/*/man?/*
|
||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
%{_datadir}/cups
|
%{_datadir}/cups
|
||||||
%{_datadir}/locale/*/*
|
%{_datadir}/locale/*/*
|
||||||
%dir %attr(1700,lp,root) /var/spool/cups/tmp
|
%dir %attr(1700,lp,sys) /var/spool/cups/tmp
|
||||||
%dir %attr(0700,lp,root) /var/spool/cups
|
%dir %attr(0700,lp,sys) /var/spool/cups
|
||||||
%dir %attr(0755,lp,root) /var/log/cups
|
%dir %attr(0755,lp,sys) /var/log/cups
|
||||||
%{_sysconfdir}/X11/sysconfig/cups.desktop
|
|
||||||
%{_sysconfdir}/X11/applnk/System/cups.desktop
|
|
||||||
%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
|
%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
|
||||||
|
%config(noreplace) %{_sysconfdir}/logrotate.d/cups
|
||||||
%{_datadir}/pixmaps/cupsprinter.png
|
%{_datadir}/pixmaps/cupsprinter.png
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
@ -256,34 +273,84 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/cups
|
%{_includedir}/cups
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Oct 29 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.9
|
* Wed Feb 12 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-13
|
||||||
- Backport 1.1.19 fix for lpd.c signal handling (bug #107256).
|
- Don't set SIGCHLD to SIG_IGN when using wait4 (via pclose) (bug #84101).
|
||||||
- Attempt to fix bug #97958 less invasively by back-porting a fix from
|
|
||||||
1.1.19.
|
|
||||||
|
|
||||||
* Mon Sep 1 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.8
|
* Tue Feb 4 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-12
|
||||||
- Prevent libcups busy loop (bug #97958).
|
- Fix cups-lpd (bug #83452).
|
||||||
|
|
||||||
* Fri May 15 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.7
|
* Fri Jan 31 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-11
|
||||||
- Rebuild for debug stripping.
|
- Build ppds.dat on first install.
|
||||||
|
|
||||||
* Thu May 15 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.5
|
* Fri Jan 24 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-10
|
||||||
- Fix typo.
|
- Add support for rebuilding ppds.dat without running the scheduler
|
||||||
|
proper (for bug #82500).
|
||||||
|
|
||||||
* Tue May 13 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.4
|
* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 1.1.17-9
|
||||||
- Update HTTP blocking fix to cups-1.1.18-str75.patchv2.
|
- rebuilt
|
||||||
|
|
||||||
* Mon May 12 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.3
|
* Wed Jan 22 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-8
|
||||||
- Fix HTTP blocking issue with scheduler: http://www.cups.org/str.php?L75.
|
- Warn against editing queues managed by redhat-config-printer
|
||||||
|
(bug #82267).
|
||||||
|
|
||||||
* Wed Jan 8 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-0.2
|
* Wed Jan 22 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-7
|
||||||
- Fix 'condrestart' behaviour in init script.
|
- Fix up error reporting in lpd backend.
|
||||||
|
|
||||||
* Fri Dec 13 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-0.1
|
* Thu Jan 9 2003 Tim Waugh <twaugh@redhat.com> 1.1.17-6
|
||||||
- 1.1.17.
|
- Add epoch to internal requirements.
|
||||||
- Fix cupsd startup hang (bug #79346).
|
- Make 'condrestart' return success exit code when daemon isn't running.
|
||||||
- Don't install files not shipped.
|
|
||||||
|
* Tue Jan 7 2003 Nalin Dahyabhai <nalin@redhat.com> 1.1.17-5
|
||||||
|
- Use pkg-config information to find SSL libraries.
|
||||||
|
|
||||||
|
* Thu Dec 19 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-4
|
||||||
- Security fixes.
|
- Security fixes.
|
||||||
|
- Make 'service cups reload' update the configuration first (bug #79953).
|
||||||
|
|
||||||
|
* Tue Dec 10 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-3
|
||||||
|
- Fix cupsd startup hang (bug #79346).
|
||||||
|
|
||||||
|
* Mon Dec 9 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-2
|
||||||
|
- Fix parallel backend behaviour when cancelling jobs.
|
||||||
|
|
||||||
|
* Mon Dec 9 2002 Tim Waugh <twaugh@redhat.com> 1.1.17-1
|
||||||
|
- 1.1.17.
|
||||||
|
- No longer need libdir patch.
|
||||||
|
- Fix logrotate script (bug #76791).
|
||||||
|
|
||||||
|
* Wed Nov 20 2002 Tim Waugh <twaugh@redhat.com>
|
||||||
|
- Build requires XFree86-devel (bug #78362).
|
||||||
|
|
||||||
|
* Wed Nov 20 2002 Tim Waugh <twaugh@redhat.com>
|
||||||
|
- 1.1.16.
|
||||||
|
- Updated system-auth patch.
|
||||||
|
- Add ncp backend script.
|
||||||
|
|
||||||
|
* Wed Nov 13 2002 Tim Waugh <twaugh@redhat.com> 1.1.15-15
|
||||||
|
- Set alternatives priority to 40.
|
||||||
|
|
||||||
|
* Mon Nov 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.1.15-14
|
||||||
|
- Buildrequire pam-devel.
|
||||||
|
- Patch default PAM config file to remove directory names from module paths,
|
||||||
|
allowing the configuration files to work equally well on multilib systems.
|
||||||
|
- Patch default PAM config file to use system-auth, require the file at build-
|
||||||
|
time because that's what data/Makefile checks for.
|
||||||
|
|
||||||
|
* Fri Nov 8 2002 Tim Waugh <twaugh@redhat.com> 1.1.15-13
|
||||||
|
- Use logrotate for log rotation (bug #76791).
|
||||||
|
- No longer need cups.desktop, since redhat-config-printer handles it.
|
||||||
|
|
||||||
|
* Thu Oct 17 2002 Tim Waugh <twaugh@redhat.com> 1.1.15-12
|
||||||
|
- Revert to libdir for CUPS_SERVERBIN.
|
||||||
|
|
||||||
|
* Thu Oct 17 2002 Tim Waugh <twaugh@redhat.com> 1.1.15-11
|
||||||
|
- Use %%configure for multilib correctness.
|
||||||
|
- Use libexec instead of lib for CUPS_SERVERBIN.
|
||||||
|
- Ship translated man pages.
|
||||||
|
- Remove unshipped files.
|
||||||
|
- Fix file list permissions (bug #59021, bug #74738).
|
||||||
|
- Fix messy initscript output (bug #65857).
|
||||||
|
- Add 'reload' to initscript (bug #76114).
|
||||||
|
|
||||||
* Fri Aug 30 2002 Bernhard Rosenkraenzer <bero@redhat.de> 1.1.15-10
|
* Fri Aug 30 2002 Bernhard Rosenkraenzer <bero@redhat.de> 1.1.15-10
|
||||||
- Add generic postscript PPD file (#73061)
|
- Add generic postscript PPD file (#73061)
|
||||||
|
51
ncp.backend
Executable file
51
ncp.backend
Executable file
@ -0,0 +1,51 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# This is a modified version of 'ncpprint'. It can now be used as a CUPS
|
||||||
|
# backend.
|
||||||
|
# Modifications:
|
||||||
|
# Copyright (C) 2002 Red Hat, inc
|
||||||
|
# Copyright (C) 2002 Tim Waugh
|
||||||
|
# Before modification: shipped as /usr/share/printconf/util/ncpprint
|
||||||
|
|
||||||
|
if [ -z "$*" ]
|
||||||
|
then
|
||||||
|
# This is where we would enumerate all the URIs we support.
|
||||||
|
# Patches welcome.
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
FILE=$6
|
||||||
|
if [ -z "$FILE" ]
|
||||||
|
then
|
||||||
|
FILE=-
|
||||||
|
fi
|
||||||
|
|
||||||
|
# $DEVICE_URI is 'ncp://[user:password@]server/queue'
|
||||||
|
URI=${DEVICE_URI#*://}
|
||||||
|
queue=${URI#*/}
|
||||||
|
URI=${URI%/$queue}
|
||||||
|
server=${URI#*@}
|
||||||
|
URI=${URI%$server}
|
||||||
|
URI=${URI%@}
|
||||||
|
if [ -n "$URI" ]
|
||||||
|
then
|
||||||
|
user=${URI%:*}
|
||||||
|
URI=${URI#$user}
|
||||||
|
password=${URI#:}
|
||||||
|
fi
|
||||||
|
|
||||||
|
#echo user: ${user-(none)}
|
||||||
|
#echo password: ${password-(none)}
|
||||||
|
#echo server: $server
|
||||||
|
#echo queue: $queue
|
||||||
|
|
||||||
|
if [ -n "$user" ]
|
||||||
|
then
|
||||||
|
if [ -n "$password" ]
|
||||||
|
then
|
||||||
|
/usr/bin/nprint -S "$server" -q "$queue" -U "$user" -P "$password" -N "$FILE" 2>/dev/null
|
||||||
|
else
|
||||||
|
/usr/bin/nprint -S "$server" -q "$queue" -U "$user" -n -N "$FILE" 2>/dev/null
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
/usr/bin/nprint -S "$server" -q "$queue" -N "$FILE" 2>/dev/null
|
||||||
|
fi
|
Loading…
Reference in New Issue
Block a user