From: Lars Wendler Date: Sat, 14 Dec 2019 11:35:22 +0000 (+0100) Subject: net-print/cups-filters: Removed old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27ebbc807c485eee52e886b67a07f80ec3b0b542;p=gentoo.git net-print/cups-filters: Removed old Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Lars Wendler --- diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 18993bd0cc40..8076bf739273 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,4 +1,3 @@ DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681 -DIST cups-filters-1.25.12.tar.xz 1484148 BLAKE2B 55f05d9c5bf8ae7eb3416de8b1bc2fe919a43875753ee0c02a1fae319d72e7d71a2e46ae8888e840972ba79bb39d515a54b276729648c872ac6c59bfbca02fa0 SHA512 587b8d550923fb5be9f71172e613af7b2bd0e70f780143574482c5efcc2cf869f7d715f63323e63a8f00acd3f08f7e0803cc5a723cdd903229389e7ce11b0c16 DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611 DIST cups-filters-1.26.0.tar.xz 1489308 BLAKE2B 4a0c67f9dba60c409cd62c3f47e167b79be01fd53c51d08c368e62919020d9f1ebe72ebd570e773537053ae4cc42846f426c166675faa0a18392afdb1d66c284 SHA512 a6e0a1b8dfec2e46cb2475639b33f60da3a74090718334883564711530e13c7524952b9f145303c1063e1ae21eb585dce1fd9c87e4ce7884ec687fdef58f2124 diff --git a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild b/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild deleted file mode 100644 index 1179f01061e1..000000000000 --- a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -inherit perl-module systemd flag-o-matic - -if [[ "${PV}" == "9999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" -else - SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint" -fi -DESCRIPTION="Cups filters" -HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" - -LICENSE="MIT GPL-2" -SLOT="0" -IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] - >=app-text/qpdf-8.3.0:= - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - >=net-print/cups-1.7.3 - !<=net-print/cups-1.5.9999 - sys-devel/bc - sys-libs/zlib - dbus? ( sys-apps/dbus ) - foomatic? ( !net-print/foomatic-filters ) - jpeg? ( virtual/jpeg:0 ) - ldap? ( net-nds/openldap ) - pdf? ( app-text/mupdf ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - tiff? ( media-libs/tiff:0 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/gdbus-codegen - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig - test? ( media-fonts/dejavu ) -" - -PATCHES=( - "${FILESDIR}/${P}-browsed_segfault.patch" #700024 -) - -src_prepare() { - default - [[ "${PV}" == "9999" ]] && eautoreconf - - # Bug #626800 - append-cxxflags -std=c++11 -} - -src_configure() { - local myeconfargs=( - --enable-imagefilters - --localstatedir="${EPREFIX}"/var - --with-browseremoteprotocols=DNSSD,CUPS - --with-cups-rundir="${EPREFIX}"/run/cups - --with-fontdir="fonts/conf.avail" - --with-pdftops=pdftops - --with-rcdir=no - --without-php - $(use_enable dbus) - $(use_enable foomatic) - $(use_enable ipp_autosetup auto-setup-driverless) - $(use_enable ldap) - $(use_enable pclm) - $(use_enable pdf mutool) - $(use_enable postscript ghostscript) - $(use_enable static-libs static) - $(use_enable zeroconf avahi) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_configure - perl-module_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_install - perl_delete_localpod - popd > /dev/null - fi - - if use postscript; then - # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 - dosym gstoraster /usr/libexec/cups/filter/pstoraster - dosym gstopxl /usr/libexec/cups/filter/pstopxl - fi - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die - - cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die - - if ! use zeroconf ; then - sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die - sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die - fi - - doinitd "${T}"/cups-browsed - systemd_dounit "${S}/utils/cups-browsed.service" -} - -src_test() { - emake check -} - -pkg_postinst() { - if ! use foomatic ; then - ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely." - ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained." - fi -} diff --git a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch deleted file mode 100644 index 8ab644155c32..000000000000 --- a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001 -From: Till Kamppeter -Date: Wed, 13 Nov 2019 18:49:01 +0100 -Subject: [PATCH] cups-browsed: Added missing memory allocations leading to a - segfault. - ---- - NEWS | 5 +++++ - utils/cups-browsed.c | 21 ++++++++++++--------- - 2 files changed, 17 insertions(+), 9 deletions(-) - -diff --git a/NEWS b/NEWS -index 67d1c18f..2de5dab4 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,6 +1,11 @@ - NEWS - OpenPrinting CUPS Filters v1.25.12 - 2019-11-12 - ------------------------------------------------------ - -+CHANGES IN V1.25.13 -+ -+ - cups-browsed: Added some missing memory allocations leading -+ to a segfault (Issue #175). -+ - CHANGES IN V1.25.12 - - - libcupsfilters: Use the text names "Draft", "Normal", and -diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c -index adbf5002..f0e05746 100644 ---- a/utils/cups-browsed.c -+++ b/utils/cups-browsed.c -@@ -2837,6 +2837,15 @@ void get_cluster_default_attributes(ipp_t** merged_attributes, - debug_printf("Default MediaType: %s\n", media_type); - } - -+ if (temp->media_type == NULL) { -+ if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD, -+ "media-type-supported")) { -+ temp->media_type = (char*)malloc(sizeof(char)*32); -+ strcpy(temp->media_type, AUTO_OPTION); -+ debug_printf("Default MediaType: " AUTO_OPTION "\n"); -+ } -+ } -+ - if ((media_attr = ippFindAttribute(media_col, "media-source", - IPP_TAG_KEYWORD)) != NULL) { - pwg_ppdize_name(ippGetString(media_attr, 0, NULL), media_source, -@@ -2852,18 +2861,12 @@ void get_cluster_default_attributes(ipp_t** merged_attributes, - if (temp->media_source == NULL) { - if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD, - "media-source-supported")) { -- strcpy(temp->media_source,AUTO_OPTION); -- debug_printf("Default MediaSource: %s\n", media_source); -+ temp->media_source = (char*)malloc(sizeof(char)*32); -+ strcpy(temp->media_source, AUTO_OPTION); -+ debug_printf("Default MediaSource: " AUTO_OPTION "\n"); - } - } - -- if (temp->media_type == NULL) { -- if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD, -- "media-type-supported")) { -- strcpy(temp->media_type, AUTO_OPTION); -- debug_printf("Default MediaType: %s\n", media_type); -- } -- } - media_col_default = ippAddCollection(*merged_attributes, IPP_TAG_PRINTER, - "media-col-default", NULL); - current_media = create_media_col(temp->x, temp->y, temp->left_margin,