From 0f1c4bdc0729b2f7a17ae9bb88b69c2fadb33659 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 18 Nov 2025 17:08:24 +0800 Subject: lprng: upgrade 3.8.C -> 3.9.0 0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch removed since it's included in 3.9.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...ckpc-Do-not-define-Mail_fd-multiple-times.patch | 34 ---------------------- meta-oe/recipes-extended/lprng/lprng_3.8.C.bb | 28 ------------------ meta-oe/recipes-extended/lprng/lprng_3.9.0.bb | 26 +++++++++++++++++ 3 files changed, 26 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch delete mode 100644 meta-oe/recipes-extended/lprng/lprng_3.8.C.bb create mode 100644 meta-oe/recipes-extended/lprng/lprng_3.9.0.bb diff --git a/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch b/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch deleted file mode 100644 index 5748690445..0000000000 --- a/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6358561d5bad34f0003ebd415142d504fe53045a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Aug 2020 11:42:08 -0700 -Subject: [PATCH] checkpc: Do not define Mail_fd multiple times - -Its also defines in var.c via lp.h this is flagged when -fno-common is -used - -Fixes -TOPDIR/build/tmp/work/core2-32-yoe-linux/lprng/3.8.C-r0/recipe-sysroot-native/usr/bin/i686-yoe-linux/i686-yoe-linux-ld: vars.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/include/lp.h:72: multiple definition of `Mail_fd'; checkpc.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/common/checkpc.c:35: first defined here -clang-11: error: linker command failed with exit code 1 (use -v to see invocation) - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/common/checkpc.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/common/checkpc.c b/src/common/checkpc.c -index aa03b08..7334094 100644 ---- a/src/common/checkpc.c -+++ b/src/common/checkpc.c -@@ -32,8 +32,6 @@ static int Remove; - static char *User_specified_printer; - static time_t Current_time; - static int Check_path_list( char *plist, int allow_missing ); --int Mail_fd; -- - - /* pathnames of the spool directory (sd) and control directory (cd) */ - --- -2.28.0 - diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb deleted file mode 100644 index fd20860a03..0000000000 --- a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "An Enhanced Printer Spooler" -SECTION = "console/utils" -LICENSE = "GPL-2.0-only | Artistic-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \ - " -SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit autotools gettext - -EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \ - CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \ - OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr" -FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" - -# configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it -export CLEAR = "no" - -do_install:append() { - mv ${D}/etc/printcap.sample ${D}/etc/printcap - mv ${D}/etc/lpd/lpd.conf.sample ${D}/etc/lpd/lpd.conf - mv ${D}/etc/lpd/lpd.perms.sample ${D}/etc/lpd/lpd.perms -} diff --git a/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb new file mode 100644 index 0000000000..04376b66ed --- /dev/null +++ b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "An Enhanced Printer Spooler" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only | Artistic-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "c92597671f4c7cbe8bb3f38fbc4283354db84c6abff1efb675fa2e120421915d" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \ + CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \ + OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr" +FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" + +# configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it +export CLEAR = "no" + +do_install:append() { + mv ${D}/etc/printcap.sample ${D}/etc/printcap + mv ${D}/etc/lpd/lpd.conf.sample ${D}/etc/lpd/lpd.conf + mv ${D}/etc/lpd/lpd.perms.sample ${D}/etc/lpd/lpd.perms +} -- cgit v1.2.3-54-g00ecf