diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/cups/cups-blacklist-usblp.conf | 10 | ||||
| -rwxr-xr-x | source/ap/cups/cups.SlackBuild | 9 | ||||
| -rw-r--r-- | source/ap/cups/doinst.sh | 6 |
3 files changed, 1 insertions, 24 deletions
diff --git a/source/ap/cups/cups-blacklist-usblp.conf b/source/ap/cups/cups-blacklist-usblp.conf deleted file mode 100644 index 0ebaa9a63..000000000 --- a/source/ap/cups/cups-blacklist-usblp.conf +++ /dev/null @@ -1,10 +0,0 @@ -############################################################################## -# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that -############################################################################## - -# Blacklist the (obsolete) usblp module. While the CUPS package has been -# patched to handle if this module is loaded, there are some reports that -# it doesn't always work. Anyway, there should be no need to have this -# module loaded, so we'll blacklist it just in case. - -blacklist usblp diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index aa9370284..010002919 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cups VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -114,13 +114,6 @@ if [ ! -z "$PAM_OPTIONS" ]; then mv $PKG/etc/pam.d/cups $PKG/etc/pam.d/cups.new fi -# Blacklist the usblp module just to make sure that it doesn't cause -# any problems: -mkdir -p $PKG/lib/modprobe.d -cp -a $CWD/cups-blacklist-usblp.conf $PKG/lib/modprobe.d -chown root:root $PKG/lib/modprobe.d/cups-blacklist-usblp.conf -chmod 644 $PKG/lib/modprobe.d/cups-blacklist-usblp.conf - # Remove files that overlap with the cups-filters package: ( cd $PKG rm -f \ diff --git a/source/ap/cups/doinst.sh b/source/ap/cups/doinst.sh index 80ebbd17e..b317ed95c 100644 --- a/source/ap/cups/doinst.sh +++ b/source/ap/cups/doinst.sh @@ -17,12 +17,6 @@ if [ -r etc/pam.d/cups.new ]; then config etc/pam.d/cups.new fi -# This file will just have to go. It appeared for a while during a -current -# devel period and has never been part of a stable release. -#config etc/modprobe.d/cups.blacklist.usblp.conf.new -rm -f etc/modprobe.d/cups.blacklist.usblp.conf.new -rm -f etc/modprobe.d/cups.blacklist.usblp.conf - # Leave any new rc.cups with the same permissions as the old one: # This is a kludge, but it's because there's no --reference option # on busybox's 'chmod': |