Commit e1e7ce22 authored by Didier Raboud's avatar Didier Raboud

New upstream version 3.18.7

parent 04c6165a

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

The GPL license applies to the files in these directories:
base
data
data/pcl
data/ps
data/ldl
data/xml
data/images
ip
pcard
pcard/pcardext
prnt
prnt/cupsext
scan
ui
io/mudext
HPLIP is free, open source software, distributed under the following open source licenses:
GNU General Public License (GPL) v2
MIT license
BSD license
Within the header of each source file, the license is listed which pertains to that particular piece of open source code. We suggest you view these header areas for further information.
A small subset of HP devices require proprietary software technologies to allow full access to printer features and performance. These technologies cannot be open sourced. Because of this, HP is releasing binary plug-ins for each of these printers that work in conjunction with our Linux Open Source Printing Software to improve the printing experience for HP’s Linux Printing Customers. These binary plug-ins require the user to read and agree to a license agreement at the time of driver installation.
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
......
......@@ -14,6 +14,8 @@ htmldir = $(hphtmldir)
doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
EXTRA_DIST = prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch prnt/hpijs/README_LIBJPG copyright
UNAME = $(shell uname -m)
EXPORT_PATH=$(shell export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/prnt/hpcups/)
EXPORT_PATH1=$(shell export LIBRARY_PATH=$LIBRARY_PATH:$PWD/prnt/hpcups/)
dist_noinst_SCRIPTS =
dist_noinst_DATA =
......@@ -162,7 +164,7 @@ if !HPLIP_CLASS_DRIVER
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER
dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
if !HPLIP_CLASS_DRIVER
......@@ -240,10 +242,9 @@ dist_apparmor_abstraction_DATA = apparmor/abstractions/hplip
endif #APPARMOR_BUILD
endif #!HPLIP_CLASS_DRIVER
if !HPLIP_CLASS_DRIVER
selinuxdir =
dist_selinux_DATA = selinux/hplip.te selinux/hplip.fc selinux/hplip.pp selinux/hplip.if
dist_selinux_DATA = selinux/hplip.te selinux/hplip.fc selinux/hplip.pp selinux/hplip.if selinux/mypol.pp selinux/mypol.te
if !HPLIP_CLASS_DRIVER
# ptest
noinst_PROGRAMS += ptest
ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h
......@@ -583,10 +584,11 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
prnt/hpcups/genPCLm.h \
common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
hpcups_LDADD = -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
......@@ -677,6 +679,16 @@ endif #HPLIP_CLASS_DRIVER
install-data-hook:
if HPLIP_BUILD
if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
fi; \
if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
fi
if !HPLIP_CLASS_DRIVER
# If scanner build, add hpaio entry to sane dll.conf.
if [ "$(scan_build)" = "yes" ]; then \
......@@ -784,7 +796,7 @@ if HPLIP_CLASS_DRIVER
rm -rf $(distdir)/logcapture.py
rm -rf $(distdir)/doctor.py
rm -rf $(distdir)/devicesettings.py
rm -rf $(distdir)/selinux/
# rm -rf $(distdir)/selinux/
rm -rf $(distdir)/installer/
rm -rf $(distdir)/copier/
rm -rf $(distdir)/apparmor/
......
This diff is collapsed.
......@@ -79,7 +79,8 @@ string TECH_CLASSES[MAX_TECH_CLASS] = {
"CLE",
"SPDOfficejetProBsize",
"CLE17",
"Mimas17"
"Mimas17",
"P15_CISS"
};
/** string array of tech sub classes */
......@@ -223,6 +224,7 @@ PAIR_VECTOR TechClassPdlKeySvalues()
TECH_CLASS_KEY_VALUE.push_back(make_pair("SPDOfficejetProBsize", "pcl3"));
TECH_CLASS_KEY_VALUE.push_back(make_pair("CLE17", "pcl3"));
TECH_CLASS_KEY_VALUE.push_back(make_pair("Mimas17", "pcl3"));
TECH_CLASS_KEY_VALUE.push_back(make_pair("P15_CISS", "pcl3"));
return TECH_CLASS_KEY_VALUE;
}
......
......@@ -127,7 +127,8 @@ TECH_CLASSES = [
"CLE",
"SPDOfficejetProBsize",
"CLE17",
"Mimas17"
"Mimas17",
"P15_CISS"
]
TECH_CLASSES.sort()
......@@ -202,7 +203,8 @@ TECH_CLASS_PDLS = {
"CLE" :'pcl3',
"SPDOfficejetProBsize" : 'pcl3',
"CLE17" : 'pcl3',
"Mimas17" : 'pcl3'
"Mimas17" : 'pcl3',
"P15_CISS" : 'pcl3'
}
PDL_TYPE_PCL = 0 # less preferred
......
......@@ -37,6 +37,7 @@ AUTH_TYPES = {'mepis': 'su',
'suse': 'su',
'mandriva': 'su',
'fedora': 'su',
'fedora28': 'sudo',
'redhat': 'su',
'rhel': 'su',
'slackware': 'su',
......@@ -137,6 +138,11 @@ class Password(object):
if self.__authType != "su" and self.__authType != "sudo":
try:
self.__authType = AUTH_TYPES[distro_name]
if distro_name == 'fedora':
import platform
ver = int(platform.dist()[1])
if ver >= 28:
self.__authType = AUTH_TYPES['fedora28']
except KeyError:
log.warn("%s distro is not found in AUTH_TYPES" % distro_name)
self.__authType = 'su'
......
#!/bin/sh
UNAME='uname -m'
VER=`$UNAME`
rpm_dir=rpm_temp/buildroot
etc_dir=/etc/hp/
etc_rules=/etc/udev/rules.d/
......@@ -9,8 +11,10 @@ usr_share_cups=/usr/share/cups/drv/hp/
usr_share_models=/usr/share/hplip/data/models/
usr_share_ppd=/usr/share/ppd/HP/
usr_share_hplip=/usr/share/hplip/
usr_share_hplip_selinux=/usr/share/hplip/selinux
ppd_hpcups=./ppd/classppd/hpcups
ppd_ps=./ppd/classppd/ps
libdir=/usr/lib
mkdir -p $rpm_dir
mkdir -p $rpm_dir$etc_dir
......@@ -20,6 +24,8 @@ mkdir -p $rpm_dir$usr_lib_cups_filter
mkdir -p $rpm_dir$usr_share_cups
mkdir -p $rpm_dir$usr_share_models
mkdir -p $rpm_dir$usr_share_ppd
mkdir -p $rpm_dir$usr_share_hplip_selinux
mkdir -p $rpm_dir$libdir
cp -f ./hplip.conf $rpm_dir$etc_dir
cp -f ./data/rules/56-hpmud.rules $rpm_dir$etc_rules
......@@ -32,9 +38,21 @@ cp -f ./data/models/models.dat $rpm_dir$usr_share_models
cp -f $ppd_hpcups/*.gz $rpm_dir$usr_share_ppd
cp -f $ppd_ps/*.gz $rpm_dir$usr_share_ppd
#cp -f hplipclassdriver.spec ./rpm_temp
echo "rpm_dir is created with specific files"
cp -f ./selinux/* $rpm_dir$usr_share_hplip_selinux
#cp -f hplipclassdriver.spec ./rpm_temp
if [ "$VER" = "x86_64" ]
then
cp -f ./prnt/hpcups/libImageProcessor-x86_64.so $rpm_dir$libdir/
cp -f ./prnt/hpcups/libImageProcessor-x86_32.so $rpm_dir$libdir/
chmod 775 $rpm_dir$libdir/libImageProcessor-x86_64.so
chmod 775 $rpm_dir$libdir/libImageProcessor-x86_32.so
elif [ "$VER" = "i686" -o "$VER" = "i386" ]
then
cp -f ./prnt/hpcups/libImageProcessor-x86_32.so $rpm_dir$libdir/
cp -f ./prnt/hpcups/libImageProcessor-x86_64.so $rpm_dir$libdir/
chmod 775 $rpm_dir$libdir/libImageProcessor-x86_32.so
chmod 775 $rpm_dir$libdir/libImageProcessor-x86_64.so
fi
echo "rpm_dir is created with specific files"
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.6.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.7.
#
# Report bugs to <3.18.6>.
# Report bugs to <3.18.7>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -246,7 +246,7 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.6 about your
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.7 about your
$0: system, including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
......@@ -569,9 +569,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HP Linux Imaging and Printing'
PACKAGE_TARNAME='hplip'
PACKAGE_VERSION='3.18.6'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.6'
PACKAGE_BUGREPORT='3.18.6'
PACKAGE_VERSION='3.18.7'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.7'
PACKAGE_BUGREPORT='3.18.7'
PACKAGE_URL=''
# Factoring default headers for most tests.
......@@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures HP Linux Imaging and Printing 3.18.6 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.18.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1558,7 +1558,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.18.6:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.18.7:";;
esac
cat <<\_ACEOF
......@@ -1659,7 +1659,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.