Browse Source

Alejandro Mery <amery@geeks.cl>:

updated lprng


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1902 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Alejandro Mery 21 years ago
parent
commit
b02e5e6544
5 changed files with 62 additions and 54 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +1
    -2
      package/base/lprng/lprng.conf
  3. +2
    -2
      package/base/lprng/lprng.desc
  4. +39
    -33
      package/base/lprng/no-lpd-killing.patch
  5. +19
    -17
      package/base/lprng/setprinter.patch

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -5,6 +5,7 @@
- of course we should install my *_ibook xkb files
- Alejandro Mery: little bdb cleanup and CV-URL
updated gcc's ssp updated and new location
updated lprng
*) 2003-11-29 (2.0.0-rc3 - 2.0.0-rc4)

+ 1
- 2
package/base/lprng/lprng.conf

@ -23,10 +23,9 @@
lprng_pm() {
rm -fr $docdir/*
cp -a README HOWTO/ TESTSUPPORT/ $docdir
cp -a README PrintingCookbook/ TESTSUPPORT/ $docdir
install_init lpd $confdir/lprng.init
rm $root/etc/lpd.conf.sample $root/etc/lpd.perms.sample
install_setprinter lprng
}

+ 2
- 2
package/base/lprng/lprng.desc

@ -47,8 +47,8 @@
[L] OpenSource
[S] Stable
[V] 3.8.21
[V] 3.8.23
[P] X -----5---9 267.000
[D] 3274403868 LPRng-3.8.21.tgz ftp://ftp.lprng.com/pub/LPRng/LPRng/
[D] 2146585544 LPRng-3.8.23.tgz ftp://ftp.lprng.com/pub/LPRng/LPRng/

+ 39
- 33
package/base/lprng/no-lpd-killing.patch

@ -37,38 +37,41 @@
- rm $i;
- done
-fi
--- ./postinstall.linux.sh.orig Sat Nov 10 16:27:13 2001
+++ ./postinstall.linux.sh Sat Nov 10 16:43:34 2001
@@ -57,60 +57,3 @@
fix "${LPD_CONF_PATH}" "${DESTDIR}${LPD_CONF_PATH}"
fix "${PRINTCAP_PATH}" "${DESTDIR}${PRINTCAP_PATH}"
--- ./postinstall.linux.sh.orig 2003-11-14 13:36:02.000000000 -0300
+++ ./postinstall.linux.sh 2003-11-29 10:26:57.000000000 -0300
@@ -68,66 +68,3 @@
${INSTALL} -m 755 $f `dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd
fi
-if [ "X$MAKEPACKAGE" != "XYES" -a "$INIT" != no ] ; then
- echo "Configuring startup scripts"
- echo "Running startup scripts"
- if [ ! -f $init ] ; then
- echo "Missing $init";
- exit 1
- fi
- if [ -f /etc/redhat-release -a -f /sbin/chkconfig ] ; then
- echo "RedHat Linux - running chkconfig"
- if [ -f /sbin/chkconfig ] ; then
- echo "Stopping CUPS server"
- service cups stop || /bin/true
- service cups-lpd stop || /bin/true
- echo "Stopping LPD server"
- service lpr stop || service lprng stop || service lpd stop || /bin/true
- echo "running chkconfig"
- (
- /sbin/chkconfig lpr off
- /sbin/chkconfig --del lpr
- /sbin/chkconfig lpr off
- /sbin/chkconfig --del lpr
- /sbin/chkconfig lpd off
- /sbin/chkconfig lprng off
- /sbin/chkconfig --del lprng
- /sbin/chkconfig cups off
- /sbin/chkconfig cups-lpd off
- /sbin/chkconfig `basename $init` off
- )
- echo "Stopping server"
- kill -INT `ps ${PSHOWALL} | awk '/lpd/{ print $1;}'` >/dev/null 2>&1
- sleep 2
- echo "Checking Printcap"
- ${SBINDIR}/checkpc -f
- echo "Installing Printer Startup Scripts"
- /sbin/chkconfig --add lprng
- /sbin/chkconfig --list lprng
- /sbin/chkconfig lprng on
- echo "Running LPRng Startup Scripts"
- /sbin/chkconfig --add `basename $init`
- /sbin/chkconfig --list `basename $init`
- /sbin/chkconfig `basename $init` on
- echo "Starting Printer"
- sh $init start
- service `basename $init` start
- echo "Printer Started"
- else
- echo "Stopping server"
@ -77,25 +80,28 @@
- echo "Checking Printcap"
- ${SBINDIR}/checkpc -f
- echo "Starting Printer"
- ${LPD_PATH}
- sh `dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd start
- echo "Printer Started"
- m=`dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd
- cat <<EOF
-#
-# You will have to install the run time startup files by hand.
-# The $init file contains the standard startup/shutdown sequence.
-# You usually need to put in links to this file in /etc/rc.d/rcX.d
-# to have it executed by the appropriate run level startup/shutdown
-# script.
-# The $m file contains the standard startup/shutdown code.
-# You should put this file in the file in common set of rc startup
-# scripts and then make symbolic links to it from the run level
-# directories.
-#
-# You can use the following a template for your installation
-#
- ln -s ../init.d/lprng /etc/rc0.d/K60lprng
- ln -s ../init.d/lprng /etc/rc1.d/K60lprng
- ln -s ../init.d/lprng /etc/rc2.d/S60lprng
- ln -s ../init.d/lprng /etc/rc3.d/S60lprng
- ln -s ../init.d/lprng /etc/rc4.d/S60lprng
- ln -s ../init.d/lprng /etc/rc5.d/S60lprng
- ln -s ../init.d/lprng /etc/rc6.d/K60lprng
-#
- initdir=/etc/rc.d
- cp `dirname ${DESTDIR}${LPD_CONF_PATH}`/lpd \${initdir}/lpd
- ln -s ../init.d/lpd \${initdir}/rc0.d/K60lprng
- ln -s ../init.d/lpd \${initdir}/rc1.d/K60lprng
- ln -s ../init.d/lpd \${initdir}/rc2.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc3.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc4.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc5.d/S60lprng
- ln -s ../init.d/lpd \${initdir}/rc6.d/K60lprng
-
-EOF
- fi;

+ 19
- 17
package/base/lprng/setprinter.patch

@ -20,31 +20,33 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./src/Makefile.in.orig 2003-03-12 22:09:09.000000000 +0100
+++ ./src/Makefile.in 2003-03-12 22:10:36.000000000 +0100
@@ -344,11 +344,11 @@
--- ./src/Makefile.in.orig 2003-11-17 17:35:23.000000000 -0300
+++ ./src/Makefile.in 2003-11-29 10:42:11.000000000 -0300
@@ -348,11 +348,11 @@
done;
${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}/lpq
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}/lprm
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}/lpr
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}/lpstat
- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}/lpc
+ ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}/lpq_lprng
+ ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}/lprm_lprng
+ ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}/lpr_lprng
+ ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}/lpstat_lprng
+ ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}/lpc_lprng
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
@@ -357,7 +357,7 @@
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_certs ${DESTDIR}${sbindir}
${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_index_certs ${DESTDIR}${sbindir}
- cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
+ cd ${DESTDIR}${bindir}; rm -f lp_lprng cancel_lprng; ln -s lpr_lprng lp_lprng; ln -s lprm_lprng cancel_lprng;
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}/lpd
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}/lpf
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}/lpbanner
@@ -361,8 +361,8 @@
${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}/checkpc
${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_certs ${DESTDIR}${sbindir}/lprng_certs
${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_index_certs ${DESTDIR}${sbindir}/lprng_index_certs
- cd ${DESTDIR}${bindir}; rm -f lp; ln -s lpr lp; echo " SYMLINK `pwd`/lp"
- cd ${DESTDIR}${bindir}; rm -f cancel; ln -s lprm cancel; echo " SYMLINK `pwd`/cancel"
+ cd ${DESTDIR}${bindir}; rm -f lp_lprng; ln -s lpr_lprng lp_lprng; echo " SYMLINK `pwd`/lp_lprng"
+ cd ${DESTDIR}${bindir}; rm -f cancel_lprng; ln -s lprm_lprng cancel_lprng; echo " SYMLINK `pwd`/cancel_lprng"
uninstall:

Loading…
Cancel
Save