From 77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 15 Sep 2018 21:19:23 +0000 Subject: Sat Sep 15 21:19:23 UTC 2018 a/kernel-firmware-20180913_44d4fca-noarch-1.txz: Upgraded. a/kernel-generic-4.14.70-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.70-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.70-x86_64-1.txz: Upgraded. ap/hplip-3.18.7-x86_64-4.txz: Rebuilt. Applied fixed patch - this has a better chance of working now. I've checked and hpcups no longer links to libImageProcessor. Which, by the way, the previous build dumped onto my main system (not even in "make install"), but not into the package itself. I no longer own an HP printer and will never buy another one, so if there are any remaining problems please report. Thanks to Matteo Bernardini. d/kernel-headers-4.14.70-x86-1.txz: Upgraded. k/kernel-source-4.14.70-noarch-1.txz: Upgraded. Config changes since 4.14.69: CLEANCACHE n -> y CMA n -> y MEMORY_FAILURE n -> y NUMA n -> y X86_CHECK_BIOS_CORRUPTION n -> y Z3FOLD m -> y ZBUD m -> y ZSMALLOC m -> y +ACPI_APEI_MEMORY_FAILURE y +ACPI_NUMA y +AMD_NUMA y +CMA_AREAS 7 +CMA_DEBUG n +CMA_DEBUGFS n +DMA_CMA n +HWPOISON_INJECT m +NEED_MULTIPLE_NODES y +NODES_SHIFT 6 +NODES_SPAN_OTHER_NODES y +NUMA_BALANCING n +NUMA_EMU n +RAS_CEC n +USE_PERCPU_NUMA_NODE_ID y +X86_64_ACPI_NUMA y +X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK n n/NetworkManager-1.14.0-x86_64-1.txz: Upgraded. Added new options: --enable-json-validation --enable-ovs xap/network-manager-applet-1.8.18-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. pasture/php-5.6.38-x86_64-1.txz: Upgraded. One security bug has been fixed in this release: Apache2: XSS due to the header Transfer-Encoding: chunked For more information, see: https://php.net/ChangeLog-5.php#5.6.38 (* Security fix *) usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/ap/hplip/hplip.SlackBuild | 6 +- source/ap/hplip/hplip.remove-ImageProcessor.diff | 112 +++++++++++++++++++++++ 2 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 source/ap/hplip/hplip.remove-ImageProcessor.diff (limited to 'source/ap/hplip') diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild index a83ac9e6..8e18782a 100755 --- a/source/ap/hplip/hplip.SlackBuild +++ b/source/ap/hplip/hplip.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hplip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -107,7 +107,9 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,' \ # sees fit to make ImageProcessor mandatory, we'll likely stick with the last # hplip release that can be made to work without it, and any HP printers that # require a newer version of hplip will not be supported. -zcat $CWD/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz | patch -p1 -l --verbose || exit 1 +#zcat $CWD/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz | patch -p1 -l --verbose || exit 1 +# Use this version instead to patch Makefile.in rather than Makefile.am: +zcat $CWD/hplip.remove-ImageProcessor.diff.gz | patch -p1 -l --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/ap/hplip/hplip.remove-ImageProcessor.diff b/source/ap/hplip/hplip.remove-ImageProcessor.diff new file mode 100644 index 00000000..759d1f1b --- /dev/null +++ b/source/ap/hplip/hplip.remove-ImageProcessor.diff @@ -0,0 +1,112 @@ +diff -Naur hplip-3.18.7.orig/Makefile.in hplip-3.18.7/Makefile.in +--- hplip-3.18.7.orig/Makefile.in 2018-07-15 22:10:08.000000000 +0200 ++++ hplip-3.18.7/Makefile.in 2018-09-15 08:17:01.813462000 +0200 +@@ -103,7 +103,7 @@ + + # ip library + @HPLIP_BUILD_TRUE@am__append_12 = libhpip.la +-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so ++@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_14 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \ + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ installer/text_install.py \ +@@ -718,8 +718,7 @@ + am__dist_models_DATA_DIST = data/models/models.dat + am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \ + prnt/drv/hpcups.drv.in.template \ +- prnt/hpcups/libImageProcessor-x86_64.so \ +- prnt/hpcups/libImageProcessor-x86_32.so scan/sane/hpaio.desc \ ++ scan/sane/hpaio.desc \ + installer/text_install.py data/localization/hplip_de.ts \ + data/localization/hplip_es.ts data/localization/hplip_fr.ts \ + data/localization/hplip_it.ts data/localization/hplip_pt.ts \ +@@ -4647,7 +4646,7 @@ + @HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h + + @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) +-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) ++@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) + + #else + #hpcupsdir = $(cupsfilterdir) +@@ -9328,16 +9327,6 @@ + + + install-data-hook: +-@HPLIP_BUILD_TRUE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ +-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ +-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ +-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ +-@HPLIP_BUILD_TRUE@ fi; \ +-@HPLIP_BUILD_TRUE@ if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ +-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ +-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ +-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ +-@HPLIP_BUILD_TRUE@ fi + # If scanner build, add hpaio entry to sane dll.conf. + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \ + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +diff -Naur hplip-3.18.7.orig/prnt/hpcups/HPCupsFilter.cpp hplip-3.18.7/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.18.7.orig/prnt/hpcups/HPCupsFilter.cpp 2018-07-15 22:08:03.000000000 +0200 ++++ hplip-3.18.7/prnt/hpcups/HPCupsFilter.cpp 2018-09-15 08:17:45.156462000 +0200 +@@ -31,7 +31,6 @@ + \*****************************************************************************/ + + #include "HPCupsFilter.h" +-#include "ImageProcessor.h" + + #include + #include +@@ -637,17 +636,11 @@ + + + sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); +- image_processor_t* imageProcessor = imageProcessorCreate(); + + while (cupsRasterReadHeader2(cups_raster, &cups_header)) + { + dbglog("DEBUG: SHIVA inside the while loop"); + +- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); +- if (result != IPE_SUCCESS){ +- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result); +- } +- + current_page_number++; + + if (current_page_number == 1) { +@@ -746,12 +739,6 @@ + color_raster = rgbRaster; + black_raster = kRaster; + +- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine); +- if (result != IPE_SUCCESS){ +- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result); +- } +- +- + if ((y == 0) && !is_ljmono) { + //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer + //may not skip blank lines before actual data +@@ -781,12 +768,6 @@ + } + } // for() loop end + +- result = imageProcessorEndPage(imageProcessor); +- if (result != IPE_SUCCESS){ +- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result); +- } +- +- + m_Job.NewPage(); + if (err != NO_ERROR) { + break; +@@ -801,8 +782,6 @@ + rgbRaster = NULL; + } + +- imageProcessorDestroy(imageProcessor); +- + unlink(hpPreProcessedRasterFile); + return ret_status; + } -- cgit v1.2.3