diff options
-rw-r--r-- | .SRCINFO | 40 | ||||
-rw-r--r-- | 0000-lprng-help-website.patch | 160 | ||||
-rw-r--r-- | 0001-hardlink-to-symlink-binaries.patch | 36 | ||||
-rw-r--r-- | 0002-openssl_1.1.patch | 46 | ||||
-rw-r--r-- | 0003-lpc-lpq-lprm-suffix.manual.patch | 19 | ||||
-rw-r--r-- | PKGBUILD | 105 | ||||
-rwxr-xr-x | foofilter | 2 | ||||
-rwxr-xr-x | gsfilter | 2 | ||||
-rw-r--r-- | lprng.install | 19 |
9 files changed, 304 insertions, 125 deletions
@@ -1,19 +1,18 @@ -# Generated by mksrcinfo v8 -# Thu Dec 27 15:13:06 UTC 2018 pkgbase = lprng-cups - pkgdesc = an enhanced, extended, and portable implementation of the Berkeley LPR lpd print spooler functionality that coexists with CUPS - pkgver = 3.8.C + pkgdesc = an enhanced, extended, and portable implementation of the Berkeley LPR lpd print spooler that coexists with CUPS + pkgver = 3.9.0 pkgrel = 1 - url = http://lprng.sourceforge.net + url = https://lprng.sourceforge.net install = lprng.install arch = i686 arch = x86_64 + arch = armv6h license = custom:Artistic + depends = glibc depends = bash depends = file depends = grep depends = sed - depends = openssl-1.0 optdepends = poppler: pdf to ps conversion in filters (gsfilter) optdepends = ghostscript: convert ps to device language in filters (gsfilter) optdepends = enscript: text to ps conversion in filters (gsfilter,psfilter) @@ -22,14 +21,16 @@ pkgbase = lprng-cups optdepends = ifhp: filters for many printers optdepends = lprng: install this instead for standard BSD binaries lp lpr lpq without cups optdepends = cups: standard BSD binaries lp lpr lpq - provides = lprng=3.8.C + provides = lprng=3.9.0 conflicts = lprng options = !strip backup = etc/lprng/lpd/lpd.conf backup = etc/lprng/lpd/lpd.perms backup = etc/lprng/printcap - source = http://sourceforge.net/projects/lprng/files/lprng/lprng-3.8.C.tar.gz - source = 0000-lprng-help-website.patch + source = http://sourceforge.net/projects/lprng/files/lprng/lprng-3.9.0.tar.gz + source = 0001-hardlink-to-symlink-binaries.patch + source = 0002-openssl_1.1.patch + source = 0003-lpc-lpq-lprm-suffix.manual.patch source = lpd.service source = gsfilter source = psfilter @@ -39,23 +40,27 @@ pkgbase = lprng-cups source = README source = lpd.conf source = lpd.perms - md5sums = 5901bed95e61d2bea3ba3056056af432 - md5sums = c9c774d21fe1304c69a62dfe8c7f77ee + md5sums = 10f4ec823df0e021404284037138aa8a + md5sums = 08fbfe9aac9aebdd88f71afc557b5e68 + md5sums = c8f1ae4eefe6b82d9097f095ab1557c8 + md5sums = 06db650ad6f5704e7a177bae23500977 md5sums = a59c448b0e37db80422175b7a1a2c304 - md5sums = 2a45ea95fc86bf9ae61f932aaac9d214 + md5sums = ce6f32b57a8e650f610523a6afaaf659 md5sums = d6c523f275bb63f68bf17d5ca02e4814 - md5sums = d8390a6cb0126dabf029fdd2c9dc07c8 + md5sums = 1fa86ca79140bed23d59a552ac2d39b2 md5sums = 496dfbb160f2a0308b7847541b03c8db md5sums = 422ad79bda6ae9d2990fdef55240e569 md5sums = 1768d2f81d6d14c22686293ca60528c1 md5sums = 3ef9f91dc0de273da1f5f1b20d49cd17 md5sums = 3f861c75c2d68c0e45b4095ab39ba1c8 - sha256sums = 694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10 - sha256sums = dc219daa8dccd6e02039568e54fa15bc0dd993f99eb2a79a1336d1212a831b71 + sha256sums = c92597671f4c7cbe8bb3f38fbc4283354db84c6abff1efb675fa2e120421915d + sha256sums = 96828bce13d6548a02e1d9849e713c950312b5c38c2282f2c5cfc5be454c6784 + sha256sums = 269d2fdd0bbef11aa933cd4d49c06a44ce227badeec2530f199b185c7bd7f4f7 + sha256sums = d071adace21df32507d69c908851dc94511f404ecea4095bcdbb7d8504d97241 sha256sums = 3b546e8dd8f7ef3a1025d7d59ed8187fa21a9b9cf839a9bbda9821733da046e1 - sha256sums = 78b9b6a30ab53f55407b873cbc23df3a129dcd22a2d55557b9e7ac3dc13b8c19 + sha256sums = c6a696dea62f7ffdade6a3071d201d076ee81e4aa14283dd4072578665e5eb7a sha256sums = f1a8a318f210cfc3814d234cb98a3de0c7a161c0e0c5671fe1c266ee03e351ec - sha256sums = a13fb767cbd142100e8020aac5b0f091f50a42602768665b8e2595f74fa31c4d + sha256sums = ce83b23dd188876b0b66de70f8b13d12036ba2ec1b837212bce6a172308904d4 sha256sums = be383447b74cf9b86666adeaf35f844b394c222abbcda7f5cd7fc64f79373b82 sha256sums = fc94245b58b23c9498a10c64aed20b6120595c6c3e1412bb419126ca78123a94 sha256sums = a4c261f5754b380ff85c454249a152cb67baf9bbf10dc95cd16026f90bacb620 @@ -63,4 +68,3 @@ pkgbase = lprng-cups sha256sums = 47b48ab7fa15ae9226463c98d6c8fce9ee9b602c3a9f96907fcd84e50902b2cc pkgname = lprng-cups - diff --git a/0000-lprng-help-website.patch b/0000-lprng-help-website.patch index a621cf7dd9ba..62e73ef71095 100644 --- a/0000-lprng-help-website.patch +++ b/0000-lprng-help-website.patch @@ -1,7 +1,9 @@ -diff -Naru3 lprng-3.8.C.orig/man/checkpc.n lprng-3.8.C/man/checkpc.n ---- lprng-3.8.C.orig/man/checkpc.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/checkpc.n 2018-12-12 22:52:08.917254556 -0500 -@@ -117,15 +117,6 @@ +diff -pNaru5 a/man/checkpc.n b/man/checkpc.n +--- a/man/checkpc.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/checkpc.n 2024-01-14 06:59:41.414515087 -0500 +@@ -115,17 +115,8 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -18,10 +20,12 @@ diff -Naru3 lprng-3.8.C.orig/man/checkpc.n lprng-3.8.C/man/checkpc.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lpbanner.n lprng-3.8.C/man/lpbanner.n ---- lprng-3.8.C.orig/man/lpbanner.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpbanner.n 2018-12-12 22:53:03.077071032 -0500 -@@ -91,15 +91,6 @@ +diff -pNaru5 a/man/lpbanner.n b/man/lpbanner.n +--- a/man/lpbanner.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpbanner.n 2024-01-14 06:59:41.414515087 -0500 +@@ -89,17 +89,8 @@ pr(1), lprng_certs(1), lprng_index_certs + .SH "AUTHOR" + Patrick Powell <papowell@lprng.com>. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -38,10 +42,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpbanner.n lprng-3.8.C/man/lpbanner.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lpc.n lprng-3.8.C/man/lpc.n ---- lprng-3.8.C.orig/man/lpc.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpc.n 2018-12-12 22:55:17.816586551 -0500 -@@ -437,9 +437,7 @@ +diff -pNaru5 a/man/lpc.n b/man/lpc.n +--- a/man/lpc.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpc.n 2024-01-14 06:59:41.414515087 -0500 +@@ -435,11 +435,9 @@ The debugging information will + help you to pinpoint the exact cause of failure. + .fi .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -53,10 +59,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpc.n lprng-3.8.C/man/lpc.n +.B http://www.lprng.com/ .SH "AUTHOR" Patrick Powell <papowell@lprng.com>. -diff -Naru3 lprng-3.8.C.orig/man/lpd.conf.n lprng-3.8.C/man/lpd.conf.n ---- lprng-3.8.C.orig/man/lpd.conf.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpd.conf.n 2018-12-12 22:55:11.406610399 -0500 -@@ -745,9 +745,7 @@ +diff -pNaru5 a/man/lpd.conf.n b/man/lpd.conf.n +--- a/man/lpd.conf.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpd.conf.n 2024-01-14 06:59:41.414515087 -0500 +@@ -743,11 +743,9 @@ The debugging information will + help you to pinpoint the exact cause of failure. + .fi .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -68,10 +76,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpd.conf.n lprng-3.8.C/man/lpd.conf.n +.B http://www.lprng.com/ .SH "AUTHOR" Patrick Powell <papowell@lprng.com>. -diff -Naru3 lprng-3.8.C.orig/man/lpd.n lprng-3.8.C/man/lpd.n ---- lprng-3.8.C.orig/man/lpd.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpd.n 2018-12-12 22:54:18.706803592 -0500 -@@ -1864,15 +1864,6 @@ +diff -pNaru5 a/man/lpd.n b/man/lpd.n +--- a/man/lpd.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpd.n 2024-01-14 06:59:41.417848423 -0500 +@@ -1862,17 +1862,8 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -88,10 +98,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpd.n lprng-3.8.C/man/lpd.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lpd.perms.n lprng-3.8.C/man/lpd.perms.n ---- lprng-3.8.C.orig/man/lpd.perms.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpd.perms.n 2018-12-12 22:54:31.546757008 -0500 -@@ -363,15 +363,6 @@ +diff -pNaru5 a/man/lpd.perms.n b/man/lpd.perms.n +--- a/man/lpd.perms.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpd.perms.n 2024-01-14 06:59:41.417848423 -0500 +@@ -361,17 +361,8 @@ pr(1), lprng_certs(1), lprng_index_certs + .SH "AUTHOR" + Patrick Powell <papowell@lprng.com>. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -108,10 +120,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpd.perms.n lprng-3.8.C/man/lpd.perms.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lpf.n lprng-3.8.C/man/lpf.n ---- lprng-3.8.C.orig/man/lpf.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpf.n 2018-12-12 22:54:45.386706441 -0500 -@@ -135,15 +135,6 @@ +diff -pNaru5 a/man/lpf.n b/man/lpf.n +--- a/man/lpf.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpf.n 2024-01-14 06:59:41.417848423 -0500 +@@ -133,17 +133,8 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -128,10 +142,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpf.n lprng-3.8.C/man/lpf.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lp.n lprng-3.8.C/man/lp.n ---- lprng-3.8.C.orig/man/lp.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lp.n 2018-12-12 22:52:47.987122879 -0500 -@@ -39,18 +39,9 @@ +diff -pNaru5 a/man/lp.n b/man/lp.n +--- a/man/lp.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lp.n 2024-01-14 06:59:41.417848423 -0500 +@@ -37,20 +37,11 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -151,10 +167,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lp.n lprng-3.8.C/man/lp.n .\" This manpage-stub is written by Bernhard R. Link <brlink@debian.org> .\" and available under GNU GPL v2 and any license LPRng is available under. -diff -Naru3 lprng-3.8.C.orig/man/lpq.n lprng-3.8.C/man/lpq.n ---- lprng-3.8.C.orig/man/lpq.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpq.n 2018-12-12 22:55:00.376651264 -0500 -@@ -282,16 +282,7 @@ +diff -pNaru5 a/man/lpq.n b/man/lpq.n +--- a/man/lpq.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpq.n 2024-01-14 06:59:41.417848423 -0500 +@@ -280,18 +280,9 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -172,10 +190,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpq.n lprng-3.8.C/man/lpq.n -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lprm.n lprng-3.8.C/man/lprm.n ---- lprng-3.8.C.orig/man/lprm.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lprm.n 2018-12-12 22:55:48.686470700 -0500 -@@ -234,15 +234,6 @@ +diff -pNaru5 a/man/lprm.n b/man/lprm.n +--- a/man/lprm.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lprm.n 2024-01-14 06:59:41.417848423 -0500 +@@ -232,17 +232,8 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -192,10 +212,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lprm.n lprng-3.8.C/man/lprm.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lpr.n lprng-3.8.C/man/lpr.n ---- lprng-3.8.C.orig/man/lpr.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpr.n 2018-12-12 22:55:36.036518373 -0500 -@@ -515,15 +515,6 @@ +diff -pNaru5 a/man/lpr.n b/man/lpr.n +--- a/man/lpr.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpr.n 2024-01-14 06:59:41.417848423 -0500 +@@ -513,17 +513,8 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -212,10 +234,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpr.n lprng-3.8.C/man/lpr.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lprng_certs.n lprng-3.8.C/man/lprng_certs.n ---- lprng-3.8.C.orig/man/lprng_certs.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lprng_certs.n 2018-12-12 22:56:03.806413369 -0500 -@@ -223,15 +223,6 @@ +diff -pNaru5 a/man/lprng_certs.n b/man/lprng_certs.n +--- a/man/lprng_certs.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lprng_certs.n 2024-01-14 06:59:41.417848423 -0500 +@@ -221,17 +221,8 @@ pr(1), lprng_certs(1), lprng_index_certs + .SH "AUTHOR" + Patrick Powell <papowell@lprng.com>. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -232,10 +256,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lprng_certs.n lprng-3.8.C/man/lprng_certs.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lprng_index_certs.n lprng-3.8.C/man/lprng_index_certs.n ---- lprng-3.8.C.orig/man/lprng_index_certs.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lprng_index_certs.n 2018-12-12 22:56:22.306342720 -0500 -@@ -38,15 +38,6 @@ +diff -pNaru5 a/man/lprng_index_certs.n b/man/lprng_index_certs.n +--- a/man/lprng_index_certs.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lprng_index_certs.n 2024-01-14 06:59:41.417848423 -0500 +@@ -36,17 +36,8 @@ pr(1), lprng_certs(1), lprng_index_certs + .SH "AUTHOR" + Patrick Powell <papowell@lprng.com>. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -252,10 +278,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lprng_index_certs.n lprng-3.8.C/man/lprng_index The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/lpstat.n lprng-3.8.C/man/lpstat.n ---- lprng-3.8.C.orig/man/lpstat.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/lpstat.n 2018-12-12 22:57:03.476183607 -0500 -@@ -107,18 +107,9 @@ +diff -pNaru5 a/man/lpstat.n b/man/lpstat.n +--- a/man/lpstat.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/lpstat.n 2024-01-14 06:59:41.417848423 -0500 +@@ -105,20 +105,11 @@ produce a long status format. + .SH "AUTHOR" + LPRng was written by Patrick Powell <papowell@lprng.com>. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -275,10 +303,12 @@ diff -Naru3 lprng-3.8.C.orig/man/lpstat.n lprng-3.8.C/man/lpstat.n .\" This manpage is written by Bernhard R. Link <brlink@debian.org> .\" and available under GNU GPL v2 and any license LPRng is available under. .\" The descriptions are extracted from lpstat.c from Patrick Powell <papowell@lprng.com> -diff -Naru3 lprng-3.8.C.orig/man/monitor.n lprng-3.8.C/man/monitor.n ---- lprng-3.8.C.orig/man/monitor.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/monitor.n 2018-12-12 22:57:19.586120669 -0500 -@@ -51,15 +51,6 @@ +diff -pNaru5 a/man/monitor.n b/man/monitor.n +--- a/man/monitor.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/monitor.n 2024-01-14 06:59:41.417848423 -0500 +@@ -49,17 +49,8 @@ pr(1), lprng_certs(1), lprng_index_certs + .SH "AUTHOR" + Patrick Powell <papowell@lprng.com>. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. @@ -295,10 +325,12 @@ diff -Naru3 lprng-3.8.C.orig/man/monitor.n lprng-3.8.C/man/monitor.n The software is available via -.B http://lprng.sourceforge.net +.B http://www.lprng.com/ -diff -Naru3 lprng-3.8.C.orig/man/printcap.n lprng-3.8.C/man/printcap.n ---- lprng-3.8.C.orig/man/printcap.n 2012-04-15 06:28:52.000000000 -0400 -+++ lprng-3.8.C/man/printcap.n 2018-12-12 22:57:35.926056463 -0500 -@@ -1218,15 +1218,6 @@ +diff -pNaru5 a/man/printcap.n b/man/printcap.n +--- a/man/printcap.n 2012-04-15 06:28:52.000000000 -0400 ++++ b/man/printcap.n 2024-01-14 06:59:41.417848423 -0500 +@@ -1216,17 +1216,8 @@ set the debugging level on (-D5) and run + The debugging information will + help you to pinpoint the exact cause of failure. .SH "HISTORY" LPRng is a enhanced printer spooler system with functionality similar to the Berkeley LPR software. diff --git a/0001-hardlink-to-symlink-binaries.patch b/0001-hardlink-to-symlink-binaries.patch new file mode 100644 index 000000000000..5632eaa0b082 --- /dev/null +++ b/0001-hardlink-to-symlink-binaries.patch @@ -0,0 +1,36 @@ +diff -pNaru5 a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2023-03-17 17:26:01.000000000 -0400 ++++ b/src/Makefile.am 2024-01-15 01:04:59.522822722 -0500 +@@ -40,12 +40,12 @@ if WITHKERBEROS + endif + endif + + install-exec-hook: + rm -f $(DESTDIR)$(bindir)/lp $(DESTDIR)$(bindir)/cancel +- ln $(DESTDIR)$(bindir)/lpr $(DESTDIR)$(bindir)/lp +- ln $(DESTDIR)$(bindir)/lprm $(DESTDIR)$(bindir)/cancel ++ ln -s lpr $(DESTDIR)$(bindir)/lp ++ ln -s lprm $(DESTDIR)$(bindir)/cancel + if WITHPLUGINS + if WITHKERBEROS + $(mkdir_p) $(DESTDIR)$(plugindir) + ln -sf kerberos5.so $(DESTDIR)$(plugindir)/kerberos.so + ln -sf kerberos5.so $(DESTDIR)$(plugindir)/k5conn.so +diff -pNaru5 a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in 2023-04-05 15:24:37.000000000 -0400 ++++ b/src/Makefile.in 2024-01-15 01:04:45.246152685 -0500 +@@ -1523,12 +1523,12 @@ uninstall-hook: + rm -f $(DESTDIR)$(bindir)/lp $(DESTDIR)$(bindir)/cancel + @WITHKERBEROS_TRUE@@WITHPLUGINS_TRUE@ rm -f $(DESTDIR)$(plugindir)/kerberos.so $(DESTDIR)$(plugindir)/k5conn.so + + install-exec-hook: + rm -f $(DESTDIR)$(bindir)/lp $(DESTDIR)$(bindir)/cancel +- ln $(DESTDIR)$(bindir)/lpr $(DESTDIR)$(bindir)/lp +- ln $(DESTDIR)$(bindir)/lprm $(DESTDIR)$(bindir)/cancel ++ ln -s lpr $(DESTDIR)$(bindir)/lp ++ ln -s lprm $(DESTDIR)$(bindir)/cancel + @WITHKERBEROS_TRUE@@WITHPLUGINS_TRUE@ $(mkdir_p) $(DESTDIR)$(plugindir) + @WITHKERBEROS_TRUE@@WITHPLUGINS_TRUE@ ln -sf kerberos5.so $(DESTDIR)$(plugindir)/kerberos.so + @WITHKERBEROS_TRUE@@WITHPLUGINS_TRUE@ ln -sf kerberos5.so $(DESTDIR)$(plugindir)/k5conn.so + @WITHKERBEROS_TRUE@@WITHPLUGINS_TRUE@uninstall-local: + @WITHKERBEROS_TRUE@@WITHPLUGINS_TRUE@ if test -l $(DESTDIR)$(plugindir)/k5conn.so ; then \ diff --git a/0002-openssl_1.1.patch b/0002-openssl_1.1.patch new file mode 100644 index 000000000000..60054ce6ccf8 --- /dev/null +++ b/0002-openssl_1.1.patch @@ -0,0 +1,46 @@ +Patch for lprng 3.9.0 adapted from Debian patch for 3.8.B +Also works on 3.8.C + +https://sources.debian.org/data/main/l/lprng/3.8.B-7/debian/patches/openssl_1.1.patch + +This matches the gentoo patch but they didn't patch configure so autogen is run again. + +This patch enables automatic detection and compile of ssl 3. Don't know if it works. + +diff -pNaru5 a/configure b/configure +--- a/configure 2023-04-05 15:24:36.000000000 -0400 ++++ b/configure 2024-01-15 01:27:40.969868625 -0500 +@@ -8066,15 +8066,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-char SSL_load_error_strings (); ++char OPENSSL_init_ssl (); + int + main () + { +-return SSL_load_error_strings (); ++return OPENSSL_init_ssl (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +diff -pNaru5 a/configure.ac b/configure.ac +--- a/configure.ac 2023-04-05 15:24:24.000000000 -0400 ++++ b/configure.ac 2024-01-15 01:27:14.393193582 -0500 +@@ -952,11 +952,11 @@ fi + SSL_LDADD="" + if test "$SSL_ENABLE" != ""; then + AC_CHECK_LIB([crypto], [RC4_set_key], [true], [SSL_ENABLE=""]) + fi + if test "$SSL_ENABLE" != ""; then +- AC_CHECK_LIB([ssl], [SSL_load_error_strings], [true], [SSL_ENABLE=""], [-lcrypto]) ++ AC_CHECK_LIB([ssl], [OPENSSL_init_ssl], [true], [SSL_ENABLE=""], [-lcrypto]) + fi + if test "$SSL_ENABLE" != ""; then + SSL_LDADD="-lssl -lcrypto" + elif test "$SSL_EXPLICITLY_ENABLED" != ""; then + AC_MSG_ERROR([Unable to use OpenSSL]) diff --git a/0003-lpc-lpq-lprm-suffix.manual.patch b/0003-lpc-lpq-lprm-suffix.manual.patch new file mode 100644 index 000000000000..18f6379455c2 --- /dev/null +++ b/0003-lpc-lpq-lprm-suffix.manual.patch @@ -0,0 +1,19 @@ +diff -pNaru5 a/src/common/lpc.c b/src/common/lpc.c +--- a/src/common/lpc.c 2023-03-17 17:26:01.000000000 -0400 ++++ b/src/common/lpc.c 2024-01-15 05:12:39.178363297 -0500 +@@ -322,10 +322,15 @@ void doaction( struct line_list *args ) + Show_formatted_info(); + } + } else if( action == OP_LPQ || action == OP_LPRM ){ + pid_t pid, result; + plp_status_t status; ++ { ++ s=args->list[0]; ++ args->list[0]=safestrdup2(s,"@SUFFIX@",__FILE__,__LINE__); ++ free(s); ++ } + if( args->count == 1 && Printer_DYN ){ + plp_snprintf(msg,sizeof(msg), "-P%s", Printer_DYN ); + Add_line_list(args,msg,0,0,0); + Check_max(args,1); + args->list[args->count] = 0; @@ -4,28 +4,32 @@ # Contributor: Frank Thieme <frank at fthieme dot net> # TODO: Did I miss references or fix too many in man pages. -# TODO: Fix lpc [lpd|lpq|lprm] and other internal usages? These run the CUPS executables. +# (done) TODO: Fix lpc [lpd|lpq|lprm] and other internal usages? These run the CUPS executables. # TODO: Improve instructions for LPR only support for brand name printers. # TODO: We shouldn't be the ones to rename the binaries. Upstream should implement EXEEXT. # TODO: Are there better versions of these old filters? # Renaming cups binaries has race conditions where binaries are bogus or missing for a short time. -set -u - -_opt_SSL10=1 +_opt_SSL=0 +_opt_SSLVER='' # Compiles with 3.0, don't know if it works +#_opt_SSLVER='-1.0' # no longer needed, patched by Debian +#_opt_SSLVER='-1.1' _primarylpr=0 # Can be changed between installs # 0 - cups binaries with original name lp lpr lpq, alternate names for lprng # 1 - lprng binaries with original name lp lpr lpq, alternate names for cups +# 2 - lprng binaries, original package, does not coexist with cups # Final test: install 0 twice, install 1 twice, install cups, install 0 twice # suffix for conflicting binaries: lpr -> lprng so tab completion will find it # Can be changed between installs. if [ "${_primarylpr}" -eq 0 ]; then _sfx='ng' # sources contain EXEEXT but I couldn't get it to do anything. -else +elif [ "${_primarylpr}" -eq 1 ]; then _sfx='cups' +else + _sfx='' fi # Need: Web based printcap editor, LPInfo? @@ -91,20 +95,22 @@ _spooldir='/var/spool/lpd' _printcap='/etc/lprng/printcap' _service='lpd.service' +set -u pkgname='lprng' -pkgver='3.8.C' +pkgver='3.9.0' pkgrel='1' -pkgdesc='an enhanced, extended, and portable implementation of the Berkeley LPR lpd print spooler functionality' +pkgdesc='an enhanced, extended, and portable implementation of the Berkeley LPR lpd print spooler' if [ ! -z "${_sfx}" ]; then pkgname+='-cups' pkgdesc+=' that coexists with CUPS' fi -arch=('i686' 'x86_64') -url='http://lprng.sourceforge.net' +arch=('i686' 'x86_64' 'armv6h') +#url="http://www.lprng.com" +url='https://lprng.sourceforge.net' license=('custom:Artistic') -depends=('bash' 'file' 'grep' 'sed') -if [ "${_opt_SSL10}" -ne 0 ]; then - depends+=('openssl-1.0') +depends=('glibc' 'bash' 'file' 'grep' 'sed') +if [ "${_opt_SSL}" -ne 0 ]; then + depends+=("openssl${_opt_SSLVER}") fi optdepends=( 'poppler: pdf to ps conversion in filters (gsfilter)' # formerly xpdf @@ -129,7 +135,6 @@ if [ ! -z "${_sfx}" ]; then fi else conflicts=('cups') - _primarylpr=0 fi backup=( 'etc/lprng/lpd/lpd.conf' @@ -145,7 +150,7 @@ _mans=( 'man1/lpstat.1' 'man8/lpc.8' ) -if [ "${_primarylpr}" -ne 0 ]; then +if [ "${_primarylpr}" -eq 1 ]; then _bins=("${_mans[@]##*/}") _bins=("${_bins[@]%%.*}") _binscups=("${_bins[@]/#/usr\/bin/}") @@ -158,7 +163,10 @@ install="${pkgname%%-*}.install" _srcdir="lprng-${pkgver}" source=( "http://sourceforge.net/projects/lprng/files/lprng/lprng-${pkgver}.tar.gz" - '0000-lprng-help-website.patch' + #'0000-lprng-help-website.patch' # Clean outdated info from help files + '0001-hardlink-to-symlink-binaries.patch' + '0002-openssl_1.1.patch' # https://sources.debian.org/data/main/l/lprng/3.8.B-7/debian/patches/openssl_1.1.patch + '0003-lpc-lpq-lprm-suffix.manual.patch' 'lpd.service' 'gsfilter' 'psfilter' @@ -169,23 +177,27 @@ source=( 'lpd.conf' 'lpd.perms' ) -md5sums=('5901bed95e61d2bea3ba3056056af432' - 'c9c774d21fe1304c69a62dfe8c7f77ee' +md5sums=('10f4ec823df0e021404284037138aa8a' + '08fbfe9aac9aebdd88f71afc557b5e68' + 'c8f1ae4eefe6b82d9097f095ab1557c8' + '06db650ad6f5704e7a177bae23500977' 'a59c448b0e37db80422175b7a1a2c304' - '2a45ea95fc86bf9ae61f932aaac9d214' + 'ce6f32b57a8e650f610523a6afaaf659' 'd6c523f275bb63f68bf17d5ca02e4814' - 'd8390a6cb0126dabf029fdd2c9dc07c8' + '1fa86ca79140bed23d59a552ac2d39b2' '496dfbb160f2a0308b7847541b03c8db' '422ad79bda6ae9d2990fdef55240e569' '1768d2f81d6d14c22686293ca60528c1' '3ef9f91dc0de273da1f5f1b20d49cd17' '3f861c75c2d68c0e45b4095ab39ba1c8') -sha256sums=('694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10' - 'dc219daa8dccd6e02039568e54fa15bc0dd993f99eb2a79a1336d1212a831b71' +sha256sums=('c92597671f4c7cbe8bb3f38fbc4283354db84c6abff1efb675fa2e120421915d' + '96828bce13d6548a02e1d9849e713c950312b5c38c2282f2c5cfc5be454c6784' + '269d2fdd0bbef11aa933cd4d49c06a44ce227badeec2530f199b185c7bd7f4f7' + 'd071adace21df32507d69c908851dc94511f404ecea4095bcdbb7d8504d97241' '3b546e8dd8f7ef3a1025d7d59ed8187fa21a9b9cf839a9bbda9821733da046e1' - '78b9b6a30ab53f55407b873cbc23df3a129dcd22a2d55557b9e7ac3dc13b8c19' + 'c6a696dea62f7ffdade6a3071d201d076ee81e4aa14283dd4072578665e5eb7a' 'f1a8a318f210cfc3814d234cb98a3de0c7a161c0e0c5671fe1c266ee03e351ec' - 'a13fb767cbd142100e8020aac5b0f091f50a42602768665b8e2595f74fa31c4d' + 'ce83b23dd188876b0b66de70f8b13d12036ba2ec1b837212bce6a172308904d4' 'be383447b74cf9b86666adeaf35f844b394c222abbcda7f5cd7fc64f79373b82' 'fc94245b58b23c9498a10c64aed20b6120595c6c3e1412bb419126ca78123a94' 'a4c261f5754b380ff85c454249a152cb67baf9bbf10dc95cd16026f90bacb620' @@ -196,9 +208,23 @@ prepare() { set -u cd "${_srcdir}" - # Clean outdated info from help files - #cp -rp "../${_srcdir}"{,.orig}; echo "diff -Naru3 ${_srcdir}{.orig,} > 'new-0000-lprng-help-website.patch'"; false - patch -Nup1 -i "${srcdir}/0000-lprng-help-website.patch" + local _f + for _f in "${source[@]}"; do + _f="${_f%%::*}" + _f="${_f##*/}" + if [[ "${_f}" = *.manual.patch ]]; then + if [ "${_primarylpr}" -eq 0 ]; then + set +u; msg2 "Patch ${_f}"; set -u + patch -Nup1 -i <(sed -E -e "s:@SUFFIX@:${_sfx}:g" "${srcdir}/${_f}") + fi + elif [[ "${_f}" = *.patch ]]; then + set +u; msg2 "Patch ${_f}"; set -u + patch -Nup1 -i "${srcdir}/${_f}" + fi + done + #cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; cd "${_srcdir}"; false + #diff -pNaru5 'a' 'b' > '0000-new.patch' + sed -e 's:/var/spool/LPD:/var/spool/lpd:g' -i 'man/lpd.n' # Clean up sbin @@ -240,11 +266,15 @@ build() { --prefix='/usr' ) local _lf='' - local _cf=' -Wno-unused-result -s' - if [ "${_opt_SSL10}" -ne 0 ]; then - _cf+=' -I/usr/include/openssl-1.0' - _lf+=' -L/usr/lib/openssl-1.0' + local _cf=' -Wno-unused-result -s -fcommon' + if [ "${_opt_SSL}" -ne 0 ]; then + if [ ! -z "${_opt_SSLVER}" ]; then + _cf+=" -I/usr/include/openssl${_opt_SSLVER}" + _lf+=" -L/usr/lib/openssl${_opt_SSLVER}" + fi _conf+=(--enable-ssl) + else + _conf+=(--disable-ssl) fi set -x CFLAGS="${CFLAGS}${_cf}" \ @@ -253,7 +283,7 @@ build() { set +x fi set -x - make -s # -j"$(nproc)" + make -s set +x set +u } @@ -273,6 +303,9 @@ EOF cd "${srcdir}" install -d "${pkgdir}${_spooldir}" + if [ "${_opt_SSL}" -eq 0 ]; then + rm "${pkgdir}/usr/bin"/*certs "${pkgdir}/usr/share/man/man1"/*certs* + fi install -Dpm0644 'lpd.service' "${pkgdir}/usr/lib/systemd/system/${_service}" install -Dpm0755 'foofilter' 'gsfilter' 'psfilter' -t "${pkgdir}/usr/share/doc/${pkgname}/" install -Dpm0644 'printcap_remote' 'printcap_server' 'README' -t "${pkgdir}/usr/share/doc/${pkgname}/" @@ -308,16 +341,13 @@ _postinst='${_script}' # secondary needs this to clean up afer a primary -> seco _primarylpr='${_primarylpr}' # This is a post-upgrade setting sent to the pre-upgrade script _cdir='${_cdir}' -" "${startdir}/${install%.pkg}" > "${startdir}/${install}" +" <(sed -E -e 's:^_[a-z]+=:#&:g' "${startdir}/${install%.pkg}") > "${startdir}/${install}" bash -n "${startdir}/${install}" || echo "${}" # Produce suffix cups or suffix lprng if [ ! -z "${_sfx}" ]; then if [ "${_primarylpr}" -ne 0 ]; then pushd "${pkgdir}/usr/bin" - # Overwrite hard links with soft links - ln -sf 'lpr' 'lp' - ln -sf 'lprm' 'cancel' local _ldir="usr/lib/${pkgname}/lprng" local _cdir="usr/lib/${pkgname}/cups" # folders to store conflicting lprng and cups files @@ -370,7 +400,8 @@ else fi # -t to generate cups test files, test option only -# -c to install/upgrade cups +# -c to install/upgrade cups from pacman hook +# Install method isn't used any more # -l to post-install lprng # -p to pre-upgrade lprng # -u to post-upgrade lprng @@ -550,7 +581,7 @@ EOF -e "1,2 s:\b${_f^^}\b:&${_sfx}:g" \ -i "${pkgdir}/usr/share/man/${_fx}" done - # Overwrite hard links with soft links + # Overwrite hard or symlinks with suffix soft links ln -sf "lpr${_sfx}" "lp${_sfx}" ln -sf "lprm${_sfx}" "cancel${_sfx}" # Rename man pages. diff --git a/foofilter b/foofilter index 9888d2358c05..8fde8fe2a97a 100755 --- a/foofilter +++ b/foofilter @@ -39,6 +39,6 @@ case "${fileinfo}" in esac # foomatic-rip sends stuff to the standard output -/usr/bin/foomatic-rip-lprng --lprng "/etc/lprng/lpd/$your_ppd" < "${tempfile}" +/usr/bin/foomatic-rip-lprng --lprng "/etc/lprng/lpd/${your_ppd}" < "${tempfile}" rm -f "${infile}" "${tempfile}" @@ -42,7 +42,7 @@ case "${fileinfo}" in esac # run the postscript through gs to produce device output in a file -echo 'quit' | gs -sOutputFile="${outfile}" -q -sPAPERSIZE="$GSPAPER" -dSAFER \ +echo 'quit' | gs -sOutputFile="${outfile}" -q -sPAPERSIZE="${GSPAPER}" -dSAFER \ -dNOPAUSE -sDEVICE="${GSDEVICE}" "${tempfile}" > /dev/null 2>&1 # send output file to standard out diff --git a/lprng.install b/lprng.install index a89378066adf..0a9b373c94d8 100644 --- a/lprng.install +++ b/lprng.install @@ -1,6 +1,18 @@ _printcap='/etc/lprng/printcap' _service='lpd.service' +_clean_untracked() { + set -u + local _untracked=( + '/usr/share/doc/lprng/lpd.conf.sample' + '/usr/share/doc/lprng/lpd.perms.sample' + '/usr/share/doc/lprng/printcap.sample' + ) + # These untracked files can't be cleaned any other way + rm -f "${_untracked[@]}" + set +u +} + _post_ui() { set -u systemctl daemon-reload @@ -20,10 +32,12 @@ _post_ui() { post_upgrade() { _post_ui + _clean_untracked } post_install() { _post_ui + _clean_untracked } pre_remove() { @@ -31,8 +45,5 @@ pre_remove() { systemctl stop "${_service}" systemctl disable "${_service}" set +u -} - -post_remove() { - systemctl daemon-reload + _clean_untracked } |