[arch-commits] CVS update of extra/daemons/lprng (4 files)
Eric Belanger
eric at archlinux.org
Tue Nov 27 04:00:16 UTC 2007
Date: Monday, November 26, 2007 @ 23:00:16
Author: eric
Path: /home/cvs-extra/extra/daemons/lprng
Removed: 20_Makefile_syntax.dpatch (1.1) PKGBUILD (1.17) gcc4.patch (1.1)
lpd (1.1)
extra repo cleanup
---------------------------+
20_Makefile_syntax.dpatch | 25 -------------------------
PKGBUILD | 33 ---------------------------------
gcc4.patch | 24 ------------------------
lpd | 33 ---------------------------------
4 files changed, 115 deletions(-)
Index: extra/daemons/lprng/20_Makefile_syntax.dpatch
diff -u extra/daemons/lprng/20_Makefile_syntax.dpatch:1.1 extra/daemons/lprng/20_Makefile_syntax.dpatch:removed
--- extra/daemons/lprng/20_Makefile_syntax.dpatch:1.1 Sat Jun 3 09:38:04 2006
+++ extra/daemons/lprng/20_Makefile_syntax.dpatch Mon Nov 26 23:00:16 2007
@@ -1,25 +0,0 @@
-diff -urNad lprng-3.8.28~/Makefile.in lprng-3.8.28/Makefile.in
---- lprng-3.8.28~/Makefile.in 2006-03-12 08:43:59.000000000 +1100
-+++ lprng-3.8.28/Makefile.in 2006-03-12 08:44:22.000000000 +1100
-@@ -42,7 +42,7 @@
- LPD_CONF_PATH=\"@LPD_CONF_PATH@\"
- PRINTCAP_PATH=\"@PRINTCAP_PATH@\"
- LPD_PATH=\"@LPD_DIR@/lpd\"
--SHELL="@SHELL@"
-+#SHELL="@SHELL@"
- LOCKFILE=\"@LOCKFILE@\"
- CONFIG_SUBDIR="@CONFIG_SUBDIR@"
- PSHOWALL="@PSHOWALL@"
-@@ -124,9 +124,9 @@
- if grep '^mkinstalldirs.*=.*case' $$i ; then \
- echo "fixing broken $$i which causes wrong path to mkinstalldirs to be used"; \
- perl -spi -e 's:^mkinstalldirs\s*=\s*.*:mkinstalldirs = \$$(SHELL) \$$(MKINSTALLDIRS):' $$i; \
-- fi \
-- fi \
-- done \
-+ fi; \
-+ fi; \
-+ done; \
- fi
- if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
- cd $@; $(MAKE) localedir=${LOCALEDIR} \
Index: extra/daemons/lprng/PKGBUILD
diff -u extra/daemons/lprng/PKGBUILD:1.17 extra/daemons/lprng/PKGBUILD:removed
--- extra/daemons/lprng/PKGBUILD:1.17 Sat Jun 3 09:38:05 2006
+++ extra/daemons/lprng/PKGBUILD Mon Nov 26 23:00:16 2007
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD,v 1.17 2006/06/03 13:38:05 arjan Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributors: Tom Newsom <Jeepster at gmx.co.uk>, Sarah Hay <sarahhay at mb.sympatico.ca> and Jochem Kossen <j.kossen at home.nl>
-
-pkgname=lprng
-pkgver=3.8.28
-pkgrel=3
-pkgdesc="The Next Generation in LPR software. It supports the standard bsd lpr commands and also supports an System V interface"
-arch=(i686 x86_64)
-depends=('bash')
-conflicts=('cups')
-backup=('etc/printcap')
-source=(ftp://ftp.lprng.com/pub/LPRng/LPRng/LPRng-$pkgver.tgz gcc4.patch 20_Makefile_syntax.dpatch)
-url="http://www.lprng.com/"
-md5sums=('1b3a0abd291b260eab6087ac0e61ed84' '1863d7ac77912b8c12d037587961bf31')
-
-build() {
- cd $startdir/src/LPRng-$pkgver
- patch -Np1 -i ../gcc4.patch || return 1
- patch -Np1 -i ../20_Makefile_syntax.dpatch || return 1
- ./configure --prefix=/usr --sysconfdir=/etc --with-openssl=/usr/bin \
- --enable-nls --disable-static --with-userid=lp --with-groupid=lp --disable-setuid
- make MAKEPACKAGE=YES || return 1
- make SUID_ROOT_PERMS=04755 MAKEPACKAGE=YES DESTDIR=$startdir/pkg install
- # locales are broken, work around
- mkdir -p $startdir/pkg/usr/share/locale/fr/LC_MESSAGES/
- mv $startdir/pkg$startdir/pkg/usr/share/locale/fr/LC_MESSAGES/LPRng.mo $startdir/pkg/usr/share/locale/fr/LC_MESSAGES/LPRng.mo
- find $startdir/pkg -mindepth 1 -maxdepth 1 -type d ! -name "etc" ! -name "usr" -exec rm -fr {} \;
- mkdir -p $startdir/pkg/etc/rc.d
- cp ../../lpd $startdir/pkg/etc/rc.d
- rm -rf $startdir/pkg/usr/etc/rc.d/init.d
- find $startdir/pkg -name '*\.la' -exec rm {} \;
-}
Index: extra/daemons/lprng/gcc4.patch
diff -u extra/daemons/lprng/gcc4.patch:1.1 extra/daemons/lprng/gcc4.patch:removed
--- extra/daemons/lprng/gcc4.patch:1.1 Fri Sep 30 14:35:26 2005
+++ extra/daemons/lprng/gcc4.patch Mon Nov 26 23:00:16 2007
@@ -1,24 +0,0 @@
-diff -urN ../tmp-orig/lprng-3.8.28/src/common/krb5_auth.c ./src/common/krb5_auth.c
---- ../tmp-orig/lprng-3.8.28/src/common/krb5_auth.c 2004-09-24 20:19:57.000000000 +0000
-+++ ./src/common/krb5_auth.c 2005-08-24 15:59:31.000000000 +0000
-@@ -922,7 +922,7 @@
- nstored = 0;
- }
-
-- if ((cc = Read_fd_len_timeout(transfer_timeout, fd, len_buf, 4)) != 4) {
-+ if ((cc = Read_fd_len_timeout(transfer_timeout, fd, (char*) len_buf, 4)) != 4) {
- /* XXX can't read enough, pipe must have closed */
- return(0);
- }
-diff -urN ../tmp-orig/lprng-3.8.28/src/common/lpq.c ./src/common/lpq.c
---- ../tmp-orig/lprng-3.8.28/src/common/lpq.c 2004-09-24 20:19:58.000000000 +0000
-+++ ./src/common/lpq.c 2005-08-24 16:08:38.000000000 +0000
-@@ -449,7 +449,7 @@
- if( (pid = dofork(0)) == 0 ){
- setuid( OriginalRUID );
- close_on_exec(3);
-- execl(CLEAR,0);
-+ execl(CLEAR,0,NULL);
- exit(1);
- } else if( pid < 0 ){
- LOGERR_DIE(LOG_ERR) _("fork() failed") );
Index: extra/daemons/lprng/lpd
diff -u extra/daemons/lprng/lpd:1.1 extra/daemons/lprng/lpd:removed
--- extra/daemons/lprng/lpd:1.1 Mon Dec 9 22:00:46 2002
+++ extra/daemons/lprng/lpd Mon Nov 26 23:00:16 2007
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting LPD Daemon"
- /usr/sbin/lpd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon lpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping LPD Daemon"
- killall -q /usr/sbin/lpd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon lpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
More information about the arch-commits
mailing list