1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-12 03:00:28 +00:00

print/foomatic-filters: remove CONFLICT with cups-filters

PR:		207181
Submitted by:	Vladimir Omelchuk <admin@vladiom.com.ua>
Approved by:	cyberbotx@cyberbotx.com (maintainer)
This commit is contained in:
Kurt Jaeger 2016-02-15 16:51:05 +00:00
parent b23390c277
commit a1570ec30b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=408946
7 changed files with 55 additions and 13 deletions

View File

@ -22,8 +22,6 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libpoppler.so:${PORTSDIR}/graphics/poppler
CONFLICTS= foomatic-filters-4*
USES= compiler:c++11-lib cpe ghostscript gmake jpeg libtool pathfix \
pkgconfig shebangfix tar:xz
CPE_VENDOR= linuxfoundation

View File

@ -3,7 +3,7 @@
PORTNAME= foomatic-filters
PORTVERSION= 4.0.17
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= print
MASTER_SITES= http://www.openprinting.org/download/foomatic/
@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
CONFLICTS= cups-filters-1.8*
USES= autoreconf ghostscript perl5 pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
@ -75,6 +73,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' ${WRKSRC}/foomaticrip.c
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/foomaticrip.c
@${REINPLACE_CMD} -e '/filter.conf/ s|if|#if|g' ${WRKSRC}/Makefile.in
@${MV} ${WRKSRC}/beh.in ${WRKSRC}/foomatic-beh.in
@${REINPLACE_CMD} -e 's|beh|foomatic-beh|' ${WRKSRC}/foomatic-beh.in
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/foomatic-rip

View File

@ -0,0 +1,31 @@
Index: files/patch-Makefile.am
===================================================================
--- Makefile.am.orig 2012-07-02 14:50:46 UTC
+++ Makefile.am
@@ -76,7 +76,7 @@ install-cups: install-bin
${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_FILTERS)
${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_BACKENDS)
ln -sf $(BINDIR)/foomatic-rip $(DESTDIR)$(CUPS_FILTERS)
- ${INSTALL} -m 755 beh $(DESTDIR)$(CUPS_BACKENDS)
+ ${INSTALL} -m 755 foomatic-beh $(DESTDIR)$(CUPS_BACKENDS)
install-ppr: install-bin
${SRC}/mkinstalldirs $(DESTDIR)$(PPR_INTERFACES)
@@ -102,7 +102,7 @@ install-man:
# Clean up the source directory
clean: remove-trash
- rm -f *.o foomatic-rip foomatic-rip.1 beh
+ rm -f *.o foomatic-rip foomatic-rip.1 foomatic-beh
rm -f .testing-stamp stamp-h1
rm -f test/*.out
@@ -140,7 +140,7 @@ uninstall-etc:
uninstall-cups:
rm -f $(DESTDIR)$(CUPS_FILTERS)/foomatic-rip
- rm -f $(DESTDIR)$(CUPS_BACKENDS)/beh
+ rm -f $(DESTDIR)$(CUPS_BACKENDS)/foomatic-beh
rmdir $(DESTDIR)$(CUPS_FILTERS) || :
rmdir $(DESTDIR)$(CUPS_BACKENDS) || :
rmdir $(DESTDIR)$(CUPS) || :

View File

@ -0,0 +1,13 @@
Index: files/patch-configure.ac
===================================================================
--- configure.ac.orig 2012-07-02 14:50:46 UTC
+++ configure.ac
@@ -148,7 +148,7 @@ AC_ARG_WITH(execpath,[ --with-execpath=
AC_MSG_RESULT([Execpath: $EXECPATH])
AC_SUBST(EXECPATH)
-AC_CONFIG_FILES([Makefile beh foomatic-rip.1])
+AC_CONFIG_FILES([Makefile foomatic-beh foomatic-rip.1])
AC_CONFIG_HEADER(config.h)
AC_OUTPUT

View File

@ -1,6 +1,6 @@
--- foomaticrip.c.orig 2012-07-02 10:50:46.000000000 -0400
+++ foomaticrip.c 2014-05-19 10:28:46.588515788 -0400
@@ -180,7 +180,7 @@
--- foomaticrip.c.orig 2012-07-02 14:50:46 UTC
+++ foomaticrip.c
@@ -180,7 +180,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo
"/opt/cups/filter:"
"/usr/lib/cups/filter";
@ -9,16 +9,16 @@
void config_set_option(const char *key, const char *value)
{
@@ -1061,7 +1061,7 @@
@@ -1061,7 +1061,7 @@ int print_file(const char *filename, int
Ghostscript is not available. */
if (spooler == SPOOLER_CUPS)
snprintf(pdf2ps_cmd, PATH_MAX,
- "pdftops '%s' '%s' '%s' '%s' '%s' '%s'",
+ "%%LOCALBASE%%/libexec/cups/filter/pdftops '%s' '%s' '%s' '%s' '%s' '%s'",
+ "/usr/local/libexec/cups/filter/pdftops '%s' '%s' '%s' '%s' '%s' '%s'",
job->id, job->user, job->title, "1", job->optstr->data,
filename);
else
@@ -1197,7 +1197,8 @@
@@ -1197,7 +1197,8 @@ int main(int argc, char** argv)
debug = 1;
if (debug) {

View File

@ -1,5 +1,5 @@
Resolves CVE-2015-8327 and CVE-2015-8560
--- util.c.orig 2015-12-17 18:07:21 UTC
--- util.c.orig 2012-07-02 14:50:46 UTC
+++ util.c
@@ -31,7 +31,7 @@
#include <assert.h>

View File

@ -1,6 +1,6 @@
bin/foomatic-rip
@sample etc/foomatic/filter.conf.sample
libexec/cups/backend/beh
libexec/cups/backend/foomatic-beh
libexec/cups/filter/foomatic-rip
lib/ppr/interfaces/foomatic-rip
lib/ppr/lib/foomatic-rip