From: Stefan Schweizer Date: Thu, 22 Jun 2006 07:04:36 +0000 (+0000) Subject: Add /etc/cups/ssl, thanks to Philipp Rosenberger and Joe... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=032a139d564627cd4d7e57ee26c7477fa9db5866;p=gentoo.git Add /etc/cups/ssl, thanks to Philipp Rosenberger and Joe Kappus in bug 137444, ebuild cleanups Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index e2a5973fa896..2184d602ea46 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.182 2006/06/20 17:17:02 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.183 2006/06/22 07:04:36 genstef Exp $ + + 22 Jun 2006; Stefan Schweizer + +files/cups-1.2.1-ssldir.patch, +files/cupsd.init, -files/cupsd.rc6, + cups-1.1.23-r1.ebuild, cups-1.1.23-r7.ebuild, cups-1.2.1-r1.ebuild: + Add /etc/cups/ssl, thanks to Philipp Rosenberger + and Joe Kappus in bug 137444, ebuild cleanups 20 Jun 2006; Markus Rothe cups-1.2.1-r1.ebuild: Added ~ppc64; bug #136902 diff --git a/net-print/cups/cups-1.1.23-r1.ebuild b/net-print/cups/cups-1.1.23-r1.ebuild index 1fe98d10e772..8040bc59ad08 100644 --- a/net-print/cups/cups-1.1.23-r1.ebuild +++ b/net-print/cups/cups-1.1.23-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.12 2006/06/15 00:07:10 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.13 2006/06/22 07:04:36 genstef Exp $ inherit eutils flag-o-matic @@ -114,7 +114,7 @@ src_install() { insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups fi - exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd + exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.init cupsd insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd # allow raw printing diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild index 19e57eb1fbea..625d7678edfd 100644 --- a/net-print/cups/cups-1.1.23-r7.ebuild +++ b/net-print/cups/cups-1.1.23-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.17 2006/06/15 00:07:10 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.18 2006/06/22 07:04:36 genstef Exp $ inherit eutils flag-o-matic pam autotools @@ -128,7 +128,7 @@ src_install() { pamd_mimic_system cups auth account - newinitd ${FILESDIR}/cupsd.rc6 cupsd + newinitd ${FILESDIR}/cupsd.init cupsd insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd # allow raw printing diff --git a/net-print/cups/cups-1.2.1-r1.ebuild b/net-print/cups/cups-1.2.1-r1.ebuild index 204069b1ae38..57a23c92059e 100644 --- a/net-print/cups/cups-1.2.1-r1.ebuild +++ b/net-print/cups/cups-1.2.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r1.ebuild,v 1.10 2006/06/20 17:17:02 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r1.ebuild,v 1.11 2006/06/22 07:04:36 genstef Exp $ -inherit eutils pam flag-o-matic multilib autotools +inherit eutils flag-o-matic multilib autotools MY_P=${P/_/} @@ -55,6 +55,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/cups-1.2.0-bindnow.patch + epatch ${FILESDIR}/cups-1.2.1-ssldir.patch # upstream has refused to fix this for me sed -i -e "s:#if defined(__linux) && defined(LP_POUTPA):#if 0:" backend/usb-unix.c @@ -103,17 +104,17 @@ src_compile() { } src_install() { - make BUILDROOT=${D} install || die "make install failed" + emake BUILDROOT=${D} install || die "emake install failed" + dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt - # cleanups - rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* - - dodoc {CHANGES,CREDITS,LICENSE,README}.txt - - pamd_mimic_system cups auth account - newinitd ${FILESDIR}/cupsd.rc6 cupsd + # clean out cups init scripts + rm -rf ${D}/etc/init.d/cups ${D}/etc/rc* + # install our init scripts + newinitd ${FILESDIR}/cupsd.init cupsd + # correct path sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd + # it is safer to disable this by default, bug 137130 grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \ sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd @@ -121,9 +122,8 @@ src_install() { exeinto /usr/libexec/cups/filter/ newexe ${FILESDIR}/pdftops.pl pdftops - fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \ - /var/spool/cups/tmp /var/spool/cups /etc/cups/{,interfaces,ppd} - keepdir /var/log/cups /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp + keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ + /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp } pkg_preinst() { diff --git a/net-print/cups/files/cups-1.2.1-ssldir.patch b/net-print/cups/files/cups-1.2.1-ssldir.patch new file mode 100644 index 000000000000..242395118062 --- /dev/null +++ b/net-print/cups/files/cups-1.2.1-ssldir.patch @@ -0,0 +1,12 @@ +--- cups-1.2.1/scheduler/Makefile.orig 2006-06-22 08:11:44.000000000 +0200 ++++ cups-1.2.1/scheduler/Makefile 2006-06-22 08:13:21.000000000 +0200 +@@ -127,6 +127,9 @@ + echo Creating $(SERVERROOT)/ppd... + $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd + -chgrp $(CUPS_GROUP) $(SERVERROOT)/ppd ++ echo Creating $(SERVERROOT)/ssl... ++ $(INSTALL_DIR) -m 755 $(SERVERROOT)/ssl ++ -chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl + echo Creating $(STATEDIR)... + $(INSTALL_DIR) -m 755 $(STATEDIR) + echo Creating $(STATEDIR)/certs... diff --git a/net-print/cups/files/cupsd.init b/net-print/cups/files/cupsd.init new file mode 100644 index 000000000000..20cb793229b6 --- /dev/null +++ b/net-print/cups/files/cupsd.init @@ -0,0 +1,21 @@ +#!/sbin/runscript + +depend() { + use net + after logger + before nfs + use hotplug + after vmware +} + +start() { + ebegin "Starting cupsd" + start-stop-daemon --start --quiet --exec /usr/sbin/cupsd + eend $? +} + +stop() { + ebegin "Stopping cupsd" + start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd + eend $? +}