Make Windows V6 drivers work thanks to Chris Smith <chris@realcomputerguy.com> in bug 111272

Package-Manager: portage-2.1_pre2

5 files changed, 246 insertions, 12 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 27326bc8fc4e..13b602080c61 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.145 2005/12/15 04:35:35 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.146 2005/12/25 19:23:47 genstef Exp $
+
+*cups-1.1.23-r6 (25 Dec 2005)
+
+  25 Dec 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/cupsaddsmb.patch, +cups-1.1.23-r6.ebuild:
+  Make Windows V6 drivers work thanks to Chris Smith
+  <chris@realcomputerguy.com> in bug 111272
 
   15 Dec 2005; Mark Loeser <halcy0n@gentoo.org> cups-1.1.23-r4.ebuild:
   Stable on x86; bug #115286
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 71b5fcb6fc28..84885bea7273 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d0b9921ec432b6d95d21cf8b9e8f08f9 ChangeLog 18986
+MD5 e90bbb9b1f783ae642776dc53696405a ChangeLog 19219
 MD5 b92beaae46fa3940593e9915f4feb8f0 cups-1.1.23-r1.ebuild 4130
 MD5 8d5e79b93c34f48926709d33a54eed0f cups-1.1.23-r2.ebuild 4239
 MD5 e6a4dd8cb2896885c0de6bb7129368ec cups-1.1.23-r3.ebuild 4537
 MD5 377407a66d89ce94f1c7cd57322c4100 cups-1.1.23-r4.ebuild 4652
 MD5 c91aced69b6a77c69445b5f500ea78c1 cups-1.1.23-r5.ebuild 4670
+MD5 1bbc34f4f33232d4e0b4c9785597bf64 cups-1.1.23-r6.ebuild 4710
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
@@ -14,21 +12,16 @@ MD5 5f90c7ea48cd8de22145e264ef4ea192 files/cups-gentooalt.patch 966
 MD5 974925d56d58ecc44c6370754d519dcb files/cups-lppasswd-setXid.patch 417
 MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
 MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
+MD5 d60cb41da71d2ce15491611377be83d0 files/cupsaddsmb.patch 2210
 MD5 0720c522b5c2bcef05d42cd4977f8702 files/cupsd.rc6 515
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r1 72
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r2 72
 MD5 22c70e955df5567e6ed03f3992bd0128 files/digest-cups-1.1.23-r3 125
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r4 72
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r5 72
+MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r6 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 MD5 f6149424fd2880c5017da501e876de59 files/pdftops.pl 5630
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDpEZN2+ySkm8kpY0RAsmwAKCTRSfyl5D3swauZWLhtsdoDawyXwCeNy9+
-dTM+pnXkfiqjJPf8Mrh0vQA=
-=XVE5
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.1.23-r6.ebuild b/net-print/cups/cups-1.1.23-r6.ebuild
new file mode 100644
index 000000000000..84c1460a6706
--- /dev/null
+++ b/net-print/cups/cups-1.1.23-r6.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2005 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-r6.ebuild,v 1.1 2005/12/25 19:23:47 genstef Exp $
+
+inherit eutils flag-o-matic pam autotools
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
+ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
+ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl slp pam samba nls cjk gnutls"
+
+DEP="pam? ( virtual/pam )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6b )
+		gnutls? ( net-libs/gnutls )
+		)
+	slp? ( >=net-libs/openslp-1.0.4 )
+	nls? ( sys-devel/gettext )
+	>=media-libs/libpng-1.2.1
+	>=media-libs/tiff-3.5.5
+	>=media-libs/jpeg-6b"
+DEPEND="${DEP}
+	>=sys-devel/autoconf-2.58"
+RDEPEND="${DEP}
+	!virtual/lpr
+	app-text/xpdf"
+PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
+PROVIDE="virtual/lpr"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/disable-strip.patch
+	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
+	epatch ${FILESDIR}/cups-gentooalt.patch
+	epatch ${FILESDIR}/${P}-bindnow.patch
+	epatch ${FILESDIR}/cupsaddsmb.patch
+	eautoconf
+
+	# disable builtin xpdf
+	sed -i -e "s:pdftops::" Makefile
+}
+
+src_compile() {
+
+	local myconf
+	use amd64 && replace-flags -Os -O2
+
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	econf \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--localstatedir=/var \
+		--with-bindnow=$(bindnow_flags) \
+		$(use_enable pam) \
+		$(use_enable ssl) \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "compile problem"
+}
+
+src_test() {
+	# upstream includes an interactive test which is a nono for gentoo.
+	# therefore, since the printing herd has bigger fish to fry, for now,
+	# we just leave it out, even if FEATURES=test
+	true
+}
+
+src_install() {
+	dodir /var/spool /var/log/cups /etc/cups
+
+	make \
+	LOCALEDIR=${D}/usr/share/locale \
+	DOCDIR=${D}/usr/share/cups/docs \
+	REQUESTS=${D}/var/spool/cups \
+	SERVERBIN=${D}/usr/$(get_libdir)/cups \
+	DATADIR=${D}/usr/share/cups \
+	INCLUDEDIR=${D}/usr/include \
+	AMANDIR=${D}/usr/share/man \
+	PMANDIR=${D}/usr/share/man \
+	MANDIR=${D}/usr/share/man \
+	SERVERROOT=${D}/etc/cups \
+	LOGDIR=${D}/var/log/cups \
+	SBINDIR=${D}/usr/sbin \
+	PAMDIR=${D}/etc/pam.d \
+	EXEC_PREFIX=${D}/usr \
+	LIBDIR=${D}/usr/$(get_libdir) \
+	BINDIR=${D}/usr/bin \
+	bindir=${D}/usr/bin \
+	INITDIR=${D}/etc \
+	PREFIX=${D} \
+	install || die "install problem"
+
+	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
+	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
+
+	# cleanups
+	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* \
+		${D}/etc/cups/{certs,interfaces,ppd} ${D}/var
+
+	sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
+		-e "s:^#\(SystemGroup\).*:\1 lp:" \
+		-e "s:^#\(User\).*:\1 lp:" \
+		-e "s:^#\(Group\).*:\1 lp:" \
+		${D}/etc/cups/cupsd.conf
+
+	pamd_mimic_system cups auth account
+
+	newinitd ${FILESDIR}/cupsd.rc6 cupsd
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
+
+	# allow raw printing
+	dosed "s:#application/octet-stream:application/octet-stream:" /etc/cups/mime.types /etc/cups/mime.convs
+
+	# Let foreign charset PDF's print. (Bug: 67493)
+	dosym /etc/xpdfrc /etc/cups/pdftops.conf
+
+	# install pdftops filter
+	exeinto /usr/lib/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
+}
+
+pkg_postinst() {
+	install -d -m0755 ${ROOT}/var/log/cups
+	install -d -m0755 ${ROOT}/var/spool
+	install -m0700 -o lp -d ${ROOT}/var/spool/cups
+	install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp
+	install -m0711 -o lp -d ${ROOT}/etc/cups/certs
+	install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd}
+
+	einfo "If you're using a USB printer, \"emerge coldplug; rc-update add"
+	einfo "coldplug boot\" is something you should probably do. This"
+	einfo "will allow any USB kernel modules (if present) to be loaded"
+	einfo "automatically at boot."
+	einfo
+	einfo "For more information about installing a printer take a look at:"
+	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
+
+	if useq cjk ; then
+		einfo
+		einfo "If you want CJK support on PDF's you'll need to re-emerge"
+		einfo "app-text/xpdf with your LINGUAS variable set instead of"
+		einfo "the CJK flag. (Bug: 67493)"
+	fi
+}
diff --git a/net-print/cups/files/cupsaddsmb.patch b/net-print/cups/files/cupsaddsmb.patch
new file mode 100644
index 000000000000..5db5ae1aae61
--- /dev/null
+++ b/net-print/cups/files/cupsaddsmb.patch
@@ -0,0 +1,62 @@
+diff -Naur cups-1.1.23.orig/systemv/cupsaddsmb.c cups-1.1.23/systemv/cupsaddsmb.c
+--- cups-1.1.23.orig/systemv/cupsaddsmb.c	2005-01-03 14:29:59.000000000 -0500
++++ cups-1.1.23/systemv/cupsaddsmb.c	2005-11-02 12:50:27.000000000 -0500
+@@ -1,5 +1,5 @@
+ /*
+- * "$Id: cupsaddsmb.patch,v 1.1 2005/12/25 19:23:47 genstef Exp $"
++ * "$Id: cupsaddsmb.patch,v 1.1 2005/12/25 19:23:47 genstef Exp $"
+  *
+  *   "cupsaddsmb" command for the Common UNIX Printing System (CUPS).
+  *
+@@ -625,7 +625,7 @@
+     * See if we also have the CUPS driver files; if so, use them!
+     */
+ 
+-    snprintf(file, sizeof(file), "%s/drivers/cupsdrv6.dll", datadir);
++    snprintf(file, sizeof(file), "%s/drivers/cupsps6.dll", datadir);
+     if (!access(file, 0))
+     {
+      /*
+@@ -633,9 +633,10 @@
+       */
+ 
+       snprintf(subcmd, sizeof(subcmd),
+-               "put %s/drivers/cupsdrv6.dll W32X86/cupsdrv6.dll;"
++               "put %s/drivers/cups6.ini W32X86/cups6.ini;"
++               "put %s/drivers/cupsps6.dll W32X86/cupsps6.dll;"
+ 	       "put %s/drivers/cupsui6.dll W32X86/cupsui6.dll",
+-	       datadir, datadir);
++	       datadir, datadir, datadir);
+ 
+       if ((status = do_samba_command(command, subcmd)) != 0)
+       {
+@@ -652,8 +653,9 @@
+       snprintf(subcmd, sizeof(subcmd),
+                "adddriver \"Windows NT x86\" \"%s:"
+ 	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
+-	       "cupsdrv6.dll,cupsui6.dll,pscript.ntf\"",
+-	       dest, dest);
++	       "pscript5.dll,%s.ppd,ps5ui.dll,pscript.hlp,pscript.ntf,"
++	       "cups6.ini,cupsps6.dll,cupsui6.dll\"",
++	       dest, dest, dest);
+     }
+     else
+     {
+@@ -665,8 +667,8 @@
+       snprintf(subcmd, sizeof(subcmd),
+                "adddriver \"Windows NT x86\" \"%s:"
+ 	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
+-	       "pscript.ntf\"",
+-	       dest, dest);
++	       "pscript5.dll,%s.ppd,ps5ui.dll,pscript.hlp,pscript.ntf\"",
++	       dest, dest, dest);
+     }
+ 
+     snprintf(command, sizeof(command), "rpcclient %s", SAMBAServer);
+@@ -947,5 +949,5 @@
+ 
+ 
+ /*
+- * End of "$Id: cupsaddsmb.patch,v 1.1 2005/12/25 19:23:47 genstef Exp $".
++ * End of "$Id: cupsaddsmb.patch,v 1.1 2005/12/25 19:23:47 genstef Exp $".
+  */
diff --git a/net-print/cups/files/digest-cups-1.1.23-r6 b/net-print/cups/files/digest-cups-1.1.23-r6
new file mode 100644
index 000000000000..64352b8bc3d5
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23-r6
@@ -0,0 +1 @@
+MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521