Page MenuHomeSolus
Files F11048905

D7990.id19095.diff
No OneTemporary
Actions

D7990.id19095.diff
View Options

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -2,16 +2,17 @@
libcups.so.2:_cupsArrayNewStrings
libcups.so.2:_cupsBufferGet
libcups.so.2:_cupsBufferRelease
-libcups.so.2:_cupsCharmapFlush
libcups.so.2:_cupsCondBroadcast
libcups.so.2:_cupsCondInit
libcups.so.2:_cupsCondWait
libcups.so.2:_cupsConnect
libcups.so.2:_cupsConvertOptions
libcups.so.2:_cupsCreateDest
+libcups.so.2:_cupsEncodeOption
libcups.so.2:_cupsEncodingName
libcups.so.2:_cupsFileCheck
libcups.so.2:_cupsFileCheckFilter
+libcups.so.2:_cupsFilePeekAhead
libcups.so.2:_cupsGet1284Values
libcups.so.2:_cupsGetDestResource
libcups.so.2:_cupsGetDests
@@ -28,6 +29,7 @@
libcups.so.2:_cupsMessageLoad
libcups.so.2:_cupsMessageLookup
libcups.so.2:_cupsMessageNew
+libcups.so.2:_cupsMessageSave
libcups.so.2:_cupsMutexInit
libcups.so.2:_cupsMutexLock
libcups.so.2:_cupsMutexUnlock
@@ -36,6 +38,19 @@
libcups.so.2:_cupsRWLockRead
libcups.so.2:_cupsRWLockWrite
libcups.so.2:_cupsRWUnlock
+libcups.so.2:_cupsRasterAddError
+libcups.so.2:_cupsRasterClearError
+libcups.so.2:_cupsRasterColorSpaceString
+libcups.so.2:_cupsRasterDelete
+libcups.so.2:_cupsRasterErrorString
+libcups.so.2:_cupsRasterExecPS
+libcups.so.2:_cupsRasterInitPWGHeader
+libcups.so.2:_cupsRasterInterpretPPD
+libcups.so.2:_cupsRasterNew
+libcups.so.2:_cupsRasterReadHeader
+libcups.so.2:_cupsRasterReadPixels
+libcups.so.2:_cupsRasterWriteHeader
+libcups.so.2:_cupsRasterWritePixels
libcups.so.2:_cupsSNMPClose
libcups.so.2:_cupsSNMPCopyOID
libcups.so.2:_cupsSNMPDefaultCommunity
@@ -48,9 +63,7 @@
libcups.so.2:_cupsSNMPStringToOID
libcups.so.2:_cupsSNMPWalk
libcups.so.2:_cupsSNMPWrite
-libcups.so.2:_cupsSetDefaults
libcups.so.2:_cupsSetError
-libcups.so.2:_cupsSetHTTPError
libcups.so.2:_cupsSetLocale
libcups.so.2:_cupsStrAlloc
libcups.so.2:_cupsStrDate
@@ -64,7 +77,7 @@
libcups.so.2:_cupsThreadCreate
libcups.so.2:_cupsThreadDetach
libcups.so.2:_cupsThreadWait
-libcups.so.2:_cupsUserDefault
+libcups.so.2:_cups_debug_set
libcups.so.2:_cups_safe_vsnprintf
libcups.so.2:_cups_strcasecmp
libcups.so.2:_cups_strcpy
@@ -78,18 +91,26 @@
libcups.so.2:_httpEncodeURI
libcups.so.2:_httpFreeCredentials
libcups.so.2:_httpResolveURI
+libcups.so.2:_httpSetDigestAuthString
libcups.so.2:_httpStatus
libcups.so.2:_httpTLSInitialize
libcups.so.2:_httpTLSPending
libcups.so.2:_httpTLSRead
-libcups.so.2:_httpTLSSetCredentials
libcups.so.2:_httpTLSSetOptions
libcups.so.2:_httpTLSStart
libcups.so.2:_httpTLSStop
libcups.so.2:_httpTLSWrite
libcups.so.2:_httpUpdate
libcups.so.2:_httpWait
+libcups.so.2:_ippFileParse
+libcups.so.2:_ippFileReadToken
libcups.so.2:_ippFindOption
+libcups.so.2:_ippVarsDeinit
+libcups.so.2:_ippVarsExpand
+libcups.so.2:_ippVarsGet
+libcups.so.2:_ippVarsInit
+libcups.so.2:_ippVarsPasswordCB
+libcups.so.2:_ippVarsSet
libcups.so.2:_ppdCacheCreateWithFile
libcups.so.2:_ppdCacheCreateWithPPD
libcups.so.2:_ppdCacheDestroy
@@ -121,6 +142,7 @@
libcups.so.2:_pwgMediaTypeForType
libcups.so.2:_pwgPageSizeForMedia
libcups.so.2:cupsAddDest
+libcups.so.2:cupsAddDestMediaOptions
libcups.so.2:cupsAddIntegerOption
libcups.so.2:cupsAddOption
libcups.so.2:cupsAdminCreateWindowsPPD
@@ -173,6 +195,7 @@
libcups.so.2:cupsDoFileRequest
libcups.so.2:cupsDoIORequest
libcups.so.2:cupsDoRequest
+libcups.so.2:cupsEncodeOption
libcups.so.2:cupsEncodeOptions
libcups.so.2:cupsEncodeOptions2
libcups.so.2:cupsEncryption
@@ -265,6 +288,18 @@
libcups.so.2:cupsPrintFiles2
libcups.so.2:cupsPutFd
libcups.so.2:cupsPutFile
+libcups.so.2:cupsRasterClose
+libcups.so.2:cupsRasterErrorString
+libcups.so.2:cupsRasterInitPWGHeader
+libcups.so.2:cupsRasterInterpretPPD
+libcups.so.2:cupsRasterOpen
+libcups.so.2:cupsRasterOpenIO
+libcups.so.2:cupsRasterReadHeader
+libcups.so.2:cupsRasterReadHeader2
+libcups.so.2:cupsRasterReadPixels
+libcups.so.2:cupsRasterWriteHeader
+libcups.so.2:cupsRasterWriteHeader2
+libcups.so.2:cupsRasterWritePixels
libcups.so.2:cupsReadResponseData
libcups.so.2:cupsRemoveDest
libcups.so.2:cupsRemoveOption
@@ -552,51 +587,6 @@
libcups.so.2:pwgMediaForPPD
libcups.so.2:pwgMediaForPWG
libcups.so.2:pwgMediaForSize
-libcupscgi.so.1:cgiCheckVariables
-libcupscgi.so.1:cgiClearVariables
-libcupscgi.so.1:cgiCompileSearch
-libcupscgi.so.1:cgiCopyTemplateFile
-libcupscgi.so.1:cgiCopyTemplateLang
-libcupscgi.so.1:cgiDoSearch
-libcupscgi.so.1:cgiEndHTML
-libcupscgi.so.1:cgiEndMultipart
-libcupscgi.so.1:cgiFormEncode
-libcupscgi.so.1:cgiFreeSearch
-libcupscgi.so.1:cgiGetArray
-libcupscgi.so.1:cgiGetAttributes
-libcupscgi.so.1:cgiGetCookie
-libcupscgi.so.1:cgiGetFile
-libcupscgi.so.1:cgiGetIPPObjects
-libcupscgi.so.1:cgiGetSize
-libcupscgi.so.1:cgiGetTemplateDir
-libcupscgi.so.1:cgiGetVariable
-libcupscgi.so.1:cgiInitialize
-libcupscgi.so.1:cgiIsPOST
-libcupscgi.so.1:cgiMoveJobs
-libcupscgi.so.1:cgiPrintCommand
-libcupscgi.so.1:cgiPrintTestPage
-libcupscgi.so.1:cgiRewriteURL
-libcupscgi.so.1:cgiSetArray
-libcupscgi.so.1:cgiSetCookie
-libcupscgi.so.1:cgiSetIPPObjectVars
-libcupscgi.so.1:cgiSetIPPVars
-libcupscgi.so.1:cgiSetServerVersion
-libcupscgi.so.1:cgiSetSize
-libcupscgi.so.1:cgiSetVariable
-libcupscgi.so.1:cgiShowIPPError
-libcupscgi.so.1:cgiShowJobs
-libcupscgi.so.1:cgiStartHTML
-libcupscgi.so.1:cgiStartMultipart
-libcupscgi.so.1:cgiSupportsMultipart
-libcupscgi.so.1:cgiText
-libcupscgi.so.1:helpDeleteIndex
-libcupscgi.so.1:helpFindNode
-libcupscgi.so.1:helpLoadIndex
-libcupscgi.so.1:helpSaveIndex
-libcupscgi.so.1:helpSearchIndex
-libcupsimage.so.2:_cupsRasterAddError
-libcupsimage.so.2:_cupsRasterClearError
-libcupsimage.so.2:_cupsRasterExecPS
libcupsimage.so.2:cupsRasterClose
libcupsimage.so.2:cupsRasterErrorString
libcupsimage.so.2:cupsRasterInitPWGHeader
@@ -609,186 +599,3 @@
libcupsimage.so.2:cupsRasterWriteHeader
libcupsimage.so.2:cupsRasterWriteHeader2
libcupsimage.so.2:cupsRasterWritePixels
-libcupsmime.so.1:_mimeError
-libcupsmime.so.1:mimeAddFilter
-libcupsmime.so.1:mimeAddType
-libcupsmime.so.1:mimeAddTypeRule
-libcupsmime.so.1:mimeDelete
-libcupsmime.so.1:mimeDeleteFilter
-libcupsmime.so.1:mimeDeleteType
-libcupsmime.so.1:mimeFileType
-libcupsmime.so.1:mimeFilter
-libcupsmime.so.1:mimeFilter2
-libcupsmime.so.1:mimeFilterLookup
-libcupsmime.so.1:mimeFirstFilter
-libcupsmime.so.1:mimeFirstType
-libcupsmime.so.1:mimeLoad
-libcupsmime.so.1:mimeLoadFilters
-libcupsmime.so.1:mimeLoadTypes
-libcupsmime.so.1:mimeNew
-libcupsmime.so.1:mimeNextFilter
-libcupsmime.so.1:mimeNextType
-libcupsmime.so.1:mimeNumFilters
-libcupsmime.so.1:mimeNumTypes
-libcupsmime.so.1:mimeSetErrorCallback
-libcupsmime.so.1:mimeType
-libcupsppdc.so.1:_ZN10ppdcChoiceC1EPKcS1_S1_
-libcupsppdc.so.1:_ZN10ppdcChoiceC2EPKcS1_S1_
-libcupsppdc.so.1:_ZN10ppdcChoiceD0Ev
-libcupsppdc.so.1:_ZN10ppdcChoiceD1Ev
-libcupsppdc.so.1:_ZN10ppdcChoiceD2Ev
-libcupsppdc.so.1:_ZN10ppdcDriver10find_groupEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver11find_optionEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver11set_versionEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver13set_file_nameEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver14set_model_nameEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver14write_ppd_fileEP12_cups_file_sP11ppdcCatalogP9ppdcArrayP10ppdcSource14ppdcLineEnding
-libcupsppdc.so.1:_ZN10ppdcDriver16set_default_fontEP8ppdcFont
-libcupsppdc.so.1:_ZN10ppdcDriver16set_default_sizeEP13ppdcMediaSize
-libcupsppdc.so.1:_ZN10ppdcDriver16set_manufacturerEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver16set_pc_file_nameEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver17find_option_groupEPKcPP9ppdcGroup
-libcupsppdc.so.1:_ZN10ppdcDriver20set_custom_size_codeEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver9find_attrEPKcS1_
-libcupsppdc.so.1:_ZN10ppdcDriverC1EPS_
-libcupsppdc.so.1:_ZN10ppdcDriverC2EPS_
-libcupsppdc.so.1:_ZN10ppdcDriverD0Ev
-libcupsppdc.so.1:_ZN10ppdcDriverD1Ev
-libcupsppdc.so.1:_ZN10ppdcDriverD2Ev
-libcupsppdc.so.1:_ZN10ppdcFilterC1EPKcS1_i
-libcupsppdc.so.1:_ZN10ppdcFilterC2EPKcS1_i
-libcupsppdc.so.1:_ZN10ppdcFilterD0Ev
-libcupsppdc.so.1:_ZN10ppdcFilterD1Ev
-libcupsppdc.so.1:_ZN10ppdcFilterD2Ev
-libcupsppdc.so.1:_ZN10ppdcOption11find_choiceEPKc
-libcupsppdc.so.1:_ZN10ppdcOption13set_defchoiceEP10ppdcChoice
-libcupsppdc.so.1:_ZN10ppdcOptionC1E11ppdcOptTypePKcS2_14ppdcOptSectionf
-libcupsppdc.so.1:_ZN10ppdcOptionC1EPS_
-libcupsppdc.so.1:_ZN10ppdcOptionC2E11ppdcOptTypePKcS2_14ppdcOptSectionf
-libcupsppdc.so.1:_ZN10ppdcOptionC2EPS_
-libcupsppdc.so.1:_ZN10ppdcOptionD0Ev
-libcupsppdc.so.1:_ZN10ppdcOptionD1Ev
-libcupsppdc.so.1:_ZN10ppdcOptionD2Ev
-libcupsppdc.so.1:_ZN10ppdcShared6retainEv
-libcupsppdc.so.1:_ZN10ppdcShared7releaseEv
-libcupsppdc.so.1:_ZN10ppdcSharedC1Ev
-libcupsppdc.so.1:_ZN10ppdcSharedC2Ev
-libcupsppdc.so.1:_ZN10ppdcSharedD0Ev
-libcupsppdc.so.1:_ZN10ppdcSharedD1Ev
-libcupsppdc.so.1:_ZN10ppdcSharedD2Ev
-libcupsppdc.so.1:_ZN10ppdcSource10get_choiceEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource10get_duplexEP8ppdcFileP10ppdcDriver
-libcupsppdc.so.1:_ZN10ppdcSource10get_filterEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource10get_optionEP8ppdcFileP10ppdcDriverP9ppdcGroup
-libcupsppdc.so.1:_ZN10ppdcSource10import_ppdEPKc
-libcupsppdc.so.1:_ZN10ppdcSource10write_fileEPKc
-libcupsppdc.so.1:_ZN10ppdcSource11add_includeEPKc
-libcupsppdc.so.1:_ZN10ppdcSource11find_driverEPKc
-libcupsppdc.so.1:_ZN10ppdcSource11get_booleanEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource11get_genericEP8ppdcFilePKcS3_S3_
-libcupsppdc.so.1:_ZN10ppdcSource11get_integerEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource11get_integerEPKc
-libcupsppdc.so.1:_ZN10ppdcSource12find_includeEPKcS1_Pci
-libcupsppdc.so.1:_ZN10ppdcSource12get_variableEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource12set_variableEPKcS1_
-libcupsppdc.so.1:_ZN10ppdcSource13find_variableEPKc
-libcupsppdc.so.1:_ZN10ppdcSource14get_constraintEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource14get_resolutionEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_color_modelEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_color_orderEPKc
-libcupsppdc.so.1:_ZN10ppdcSource15get_color_spaceEPKc
-libcupsppdc.so.1:_ZN10ppdcSource15get_custom_sizeEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_installableEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_measurementEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource17get_color_profileEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource18get_simple_profileEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource6get_poEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource6quotefEP12_cups_file_sPKcz
-libcupsppdc.so.1:_ZN10ppdcSource7find_poEPKc
-libcupsppdc.so.1:_ZN10ppdcSource8get_attrEP8ppdcFileb
-libcupsppdc.so.1:_ZN10ppdcSource8get_fontEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource8get_sizeEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource9find_sizeEPKc
-libcupsppdc.so.1:_ZN10ppdcSource9get_floatEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource9get_groupEP8ppdcFileP10ppdcDriver
-libcupsppdc.so.1:_ZN10ppdcSource9get_tokenEP8ppdcFilePci
-libcupsppdc.so.1:_ZN10ppdcSource9read_fileEPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN10ppdcSource9scan_fileEP8ppdcFileP10ppdcDriverb
-libcupsppdc.so.1:_ZN10ppdcSourceC1EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN10ppdcSourceC2EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN10ppdcSourceD0Ev
-libcupsppdc.so.1:_ZN10ppdcSourceD1Ev
-libcupsppdc.so.1:_ZN10ppdcSourceD2Ev
-libcupsppdc.so.1:_ZN10ppdcStringC1EPKc
-libcupsppdc.so.1:_ZN10ppdcStringC2EPKc
-libcupsppdc.so.1:_ZN10ppdcStringD0Ev
-libcupsppdc.so.1:_ZN10ppdcStringD1Ev
-libcupsppdc.so.1:_ZN10ppdcStringD2Ev
-libcupsppdc.so.1:_ZN11ppdcCatalog11add_messageEPKcS1_
-libcupsppdc.so.1:_ZN11ppdcCatalog12find_messageEPKc
-libcupsppdc.so.1:_ZN11ppdcCatalog13load_messagesEPKc
-libcupsppdc.so.1:_ZN11ppdcCatalog13save_messagesEPKc
-libcupsppdc.so.1:_ZN11ppdcCatalogC1EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcCatalogC2EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcCatalogD0Ev
-libcupsppdc.so.1:_ZN11ppdcCatalogD1Ev
-libcupsppdc.so.1:_ZN11ppdcCatalogD2Ev
-libcupsppdc.so.1:_ZN11ppdcMessageC1EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcMessageC2EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcMessageD0Ev
-libcupsppdc.so.1:_ZN11ppdcMessageD1Ev
-libcupsppdc.so.1:_ZN11ppdcMessageD2Ev
-libcupsppdc.so.1:_ZN11ppdcProfileC1EPKcS1_ffPKf
-libcupsppdc.so.1:_ZN11ppdcProfileC2EPKcS1_ffPKf
-libcupsppdc.so.1:_ZN11ppdcProfileD0Ev
-libcupsppdc.so.1:_ZN11ppdcProfileD1Ev
-libcupsppdc.so.1:_ZN11ppdcProfileD2Ev
-libcupsppdc.so.1:_ZN12ppdcVariable9set_valueEPKc
-libcupsppdc.so.1:_ZN12ppdcVariableC1EPKcS1_
-libcupsppdc.so.1:_ZN12ppdcVariableC2EPKcS1_
-libcupsppdc.so.1:_ZN12ppdcVariableD0Ev
-libcupsppdc.so.1:_ZN12ppdcVariableD1Ev
-libcupsppdc.so.1:_ZN12ppdcVariableD2Ev
-libcupsppdc.so.1:_ZN13ppdcMediaSizeC1EPKcS1_ffffffS1_S1_
-libcupsppdc.so.1:_ZN13ppdcMediaSizeC2EPKcS1_ffffffS1_S1_
-libcupsppdc.so.1:_ZN13ppdcMediaSizeD0Ev
-libcupsppdc.so.1:_ZN13ppdcMediaSizeD1Ev
-libcupsppdc.so.1:_ZN13ppdcMediaSizeD2Ev
-libcupsppdc.so.1:_ZN14ppdcConstraintC1EPKcS1_S1_S1_
-libcupsppdc.so.1:_ZN14ppdcConstraintC2EPKcS1_S1_S1_
-libcupsppdc.so.1:_ZN14ppdcConstraintD0Ev
-libcupsppdc.so.1:_ZN14ppdcConstraintD1Ev
-libcupsppdc.so.1:_ZN14ppdcConstraintD2Ev
-libcupsppdc.so.1:_ZN8ppdcAttrC1EPKcS1_S1_S1_b
-libcupsppdc.so.1:_ZN8ppdcAttrC2EPKcS1_S1_S1_b
-libcupsppdc.so.1:_ZN8ppdcAttrD0Ev
-libcupsppdc.so.1:_ZN8ppdcAttrD1Ev
-libcupsppdc.so.1:_ZN8ppdcAttrD2Ev
-libcupsppdc.so.1:_ZN8ppdcFile3getEv
-libcupsppdc.so.1:_ZN8ppdcFile4peekEv
-libcupsppdc.so.1:_ZN8ppdcFileC1EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN8ppdcFileC2EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN8ppdcFileD1Ev
-libcupsppdc.so.1:_ZN8ppdcFileD2Ev
-libcupsppdc.so.1:_ZN8ppdcFontC1EPKcS1_S1_S1_14ppdcFontStatus
-libcupsppdc.so.1:_ZN8ppdcFontC2EPKcS1_S1_S1_14ppdcFontStatus
-libcupsppdc.so.1:_ZN8ppdcFontD0Ev
-libcupsppdc.so.1:_ZN8ppdcFontD1Ev
-libcupsppdc.so.1:_ZN8ppdcFontD2Ev
-libcupsppdc.so.1:_ZN9ppdcArray3addEP10ppdcShared
-libcupsppdc.so.1:_ZN9ppdcArray4nextEv
-libcupsppdc.so.1:_ZN9ppdcArray5firstEv
-libcupsppdc.so.1:_ZN9ppdcArray6removeEP10ppdcShared
-libcupsppdc.so.1:_ZN9ppdcArrayC1EPS_
-libcupsppdc.so.1:_ZN9ppdcArrayC2EPS_
-libcupsppdc.so.1:_ZN9ppdcArrayD0Ev
-libcupsppdc.so.1:_ZN9ppdcArrayD1Ev
-libcupsppdc.so.1:_ZN9ppdcArrayD2Ev
-libcupsppdc.so.1:_ZN9ppdcGroup11find_optionEPKc
-libcupsppdc.so.1:_ZN9ppdcGroupC1EPKcS1_
-libcupsppdc.so.1:_ZN9ppdcGroupC1EPS_
-libcupsppdc.so.1:_ZN9ppdcGroupC2EPKcS1_
-libcupsppdc.so.1:_ZN9ppdcGroupC2EPS_
-libcupsppdc.so.1:_ZN9ppdcGroupD0Ev
-libcupsppdc.so.1:_ZN9ppdcGroupD1Ev
-libcupsppdc.so.1:_ZN9ppdcGroupD2Ev
diff --git a/abi_symbols32 b/abi_symbols32
--- a/abi_symbols32
+++ b/abi_symbols32
@@ -2,16 +2,17 @@
libcups.so.2:_cupsArrayNewStrings
libcups.so.2:_cupsBufferGet
libcups.so.2:_cupsBufferRelease
-libcups.so.2:_cupsCharmapFlush
libcups.so.2:_cupsCondBroadcast
libcups.so.2:_cupsCondInit
libcups.so.2:_cupsCondWait
libcups.so.2:_cupsConnect
libcups.so.2:_cupsConvertOptions
libcups.so.2:_cupsCreateDest
+libcups.so.2:_cupsEncodeOption
libcups.so.2:_cupsEncodingName
libcups.so.2:_cupsFileCheck
libcups.so.2:_cupsFileCheckFilter
+libcups.so.2:_cupsFilePeekAhead
libcups.so.2:_cupsGet1284Values
libcups.so.2:_cupsGetDestResource
libcups.so.2:_cupsGetDests
@@ -28,6 +29,7 @@
libcups.so.2:_cupsMessageLoad
libcups.so.2:_cupsMessageLookup
libcups.so.2:_cupsMessageNew
+libcups.so.2:_cupsMessageSave
libcups.so.2:_cupsMutexInit
libcups.so.2:_cupsMutexLock
libcups.so.2:_cupsMutexUnlock
@@ -36,6 +38,19 @@
libcups.so.2:_cupsRWLockRead
libcups.so.2:_cupsRWLockWrite
libcups.so.2:_cupsRWUnlock
+libcups.so.2:_cupsRasterAddError
+libcups.so.2:_cupsRasterClearError
+libcups.so.2:_cupsRasterColorSpaceString
+libcups.so.2:_cupsRasterDelete
+libcups.so.2:_cupsRasterErrorString
+libcups.so.2:_cupsRasterExecPS
+libcups.so.2:_cupsRasterInitPWGHeader
+libcups.so.2:_cupsRasterInterpretPPD
+libcups.so.2:_cupsRasterNew
+libcups.so.2:_cupsRasterReadHeader
+libcups.so.2:_cupsRasterReadPixels
+libcups.so.2:_cupsRasterWriteHeader
+libcups.so.2:_cupsRasterWritePixels
libcups.so.2:_cupsSNMPClose
libcups.so.2:_cupsSNMPCopyOID
libcups.so.2:_cupsSNMPDefaultCommunity
@@ -48,9 +63,7 @@
libcups.so.2:_cupsSNMPStringToOID
libcups.so.2:_cupsSNMPWalk
libcups.so.2:_cupsSNMPWrite
-libcups.so.2:_cupsSetDefaults
libcups.so.2:_cupsSetError
-libcups.so.2:_cupsSetHTTPError
libcups.so.2:_cupsSetLocale
libcups.so.2:_cupsStrAlloc
libcups.so.2:_cupsStrDate
@@ -64,7 +77,7 @@
libcups.so.2:_cupsThreadCreate
libcups.so.2:_cupsThreadDetach
libcups.so.2:_cupsThreadWait
-libcups.so.2:_cupsUserDefault
+libcups.so.2:_cups_debug_set
libcups.so.2:_cups_safe_vsnprintf
libcups.so.2:_cups_strcasecmp
libcups.so.2:_cups_strcpy
@@ -78,18 +91,26 @@
libcups.so.2:_httpEncodeURI
libcups.so.2:_httpFreeCredentials
libcups.so.2:_httpResolveURI
+libcups.so.2:_httpSetDigestAuthString
libcups.so.2:_httpStatus
libcups.so.2:_httpTLSInitialize
libcups.so.2:_httpTLSPending
libcups.so.2:_httpTLSRead
-libcups.so.2:_httpTLSSetCredentials
libcups.so.2:_httpTLSSetOptions
libcups.so.2:_httpTLSStart
libcups.so.2:_httpTLSStop
libcups.so.2:_httpTLSWrite
libcups.so.2:_httpUpdate
libcups.so.2:_httpWait
+libcups.so.2:_ippFileParse
+libcups.so.2:_ippFileReadToken
libcups.so.2:_ippFindOption
+libcups.so.2:_ippVarsDeinit
+libcups.so.2:_ippVarsExpand
+libcups.so.2:_ippVarsGet
+libcups.so.2:_ippVarsInit
+libcups.so.2:_ippVarsPasswordCB
+libcups.so.2:_ippVarsSet
libcups.so.2:_ppdCacheCreateWithFile
libcups.so.2:_ppdCacheCreateWithPPD
libcups.so.2:_ppdCacheDestroy
@@ -121,6 +142,7 @@
libcups.so.2:_pwgMediaTypeForType
libcups.so.2:_pwgPageSizeForMedia
libcups.so.2:cupsAddDest
+libcups.so.2:cupsAddDestMediaOptions
libcups.so.2:cupsAddIntegerOption
libcups.so.2:cupsAddOption
libcups.so.2:cupsAdminCreateWindowsPPD
@@ -173,6 +195,7 @@
libcups.so.2:cupsDoFileRequest
libcups.so.2:cupsDoIORequest
libcups.so.2:cupsDoRequest
+libcups.so.2:cupsEncodeOption
libcups.so.2:cupsEncodeOptions
libcups.so.2:cupsEncodeOptions2
libcups.so.2:cupsEncryption
@@ -265,6 +288,18 @@
libcups.so.2:cupsPrintFiles2
libcups.so.2:cupsPutFd
libcups.so.2:cupsPutFile
+libcups.so.2:cupsRasterClose
+libcups.so.2:cupsRasterErrorString
+libcups.so.2:cupsRasterInitPWGHeader
+libcups.so.2:cupsRasterInterpretPPD
+libcups.so.2:cupsRasterOpen
+libcups.so.2:cupsRasterOpenIO
+libcups.so.2:cupsRasterReadHeader
+libcups.so.2:cupsRasterReadHeader2
+libcups.so.2:cupsRasterReadPixels
+libcups.so.2:cupsRasterWriteHeader
+libcups.so.2:cupsRasterWriteHeader2
+libcups.so.2:cupsRasterWritePixels
libcups.so.2:cupsReadResponseData
libcups.so.2:cupsRemoveDest
libcups.so.2:cupsRemoveOption
@@ -552,51 +587,6 @@
libcups.so.2:pwgMediaForPPD
libcups.so.2:pwgMediaForPWG
libcups.so.2:pwgMediaForSize
-libcupscgi.so.1:cgiCheckVariables
-libcupscgi.so.1:cgiClearVariables
-libcupscgi.so.1:cgiCompileSearch
-libcupscgi.so.1:cgiCopyTemplateFile
-libcupscgi.so.1:cgiCopyTemplateLang
-libcupscgi.so.1:cgiDoSearch
-libcupscgi.so.1:cgiEndHTML
-libcupscgi.so.1:cgiEndMultipart
-libcupscgi.so.1:cgiFormEncode
-libcupscgi.so.1:cgiFreeSearch
-libcupscgi.so.1:cgiGetArray
-libcupscgi.so.1:cgiGetAttributes
-libcupscgi.so.1:cgiGetCookie
-libcupscgi.so.1:cgiGetFile
-libcupscgi.so.1:cgiGetIPPObjects
-libcupscgi.so.1:cgiGetSize
-libcupscgi.so.1:cgiGetTemplateDir
-libcupscgi.so.1:cgiGetVariable
-libcupscgi.so.1:cgiInitialize
-libcupscgi.so.1:cgiIsPOST
-libcupscgi.so.1:cgiMoveJobs
-libcupscgi.so.1:cgiPrintCommand
-libcupscgi.so.1:cgiPrintTestPage
-libcupscgi.so.1:cgiRewriteURL
-libcupscgi.so.1:cgiSetArray
-libcupscgi.so.1:cgiSetCookie
-libcupscgi.so.1:cgiSetIPPObjectVars
-libcupscgi.so.1:cgiSetIPPVars
-libcupscgi.so.1:cgiSetServerVersion
-libcupscgi.so.1:cgiSetSize
-libcupscgi.so.1:cgiSetVariable
-libcupscgi.so.1:cgiShowIPPError
-libcupscgi.so.1:cgiShowJobs
-libcupscgi.so.1:cgiStartHTML
-libcupscgi.so.1:cgiStartMultipart
-libcupscgi.so.1:cgiSupportsMultipart
-libcupscgi.so.1:cgiText
-libcupscgi.so.1:helpDeleteIndex
-libcupscgi.so.1:helpFindNode
-libcupscgi.so.1:helpLoadIndex
-libcupscgi.so.1:helpSaveIndex
-libcupscgi.so.1:helpSearchIndex
-libcupsimage.so.2:_cupsRasterAddError
-libcupsimage.so.2:_cupsRasterClearError
-libcupsimage.so.2:_cupsRasterExecPS
libcupsimage.so.2:cupsRasterClose
libcupsimage.so.2:cupsRasterErrorString
libcupsimage.so.2:cupsRasterInitPWGHeader
@@ -609,186 +599,3 @@
libcupsimage.so.2:cupsRasterWriteHeader
libcupsimage.so.2:cupsRasterWriteHeader2
libcupsimage.so.2:cupsRasterWritePixels
-libcupsmime.so.1:_mimeError
-libcupsmime.so.1:mimeAddFilter
-libcupsmime.so.1:mimeAddType
-libcupsmime.so.1:mimeAddTypeRule
-libcupsmime.so.1:mimeDelete
-libcupsmime.so.1:mimeDeleteFilter
-libcupsmime.so.1:mimeDeleteType
-libcupsmime.so.1:mimeFileType
-libcupsmime.so.1:mimeFilter
-libcupsmime.so.1:mimeFilter2
-libcupsmime.so.1:mimeFilterLookup
-libcupsmime.so.1:mimeFirstFilter
-libcupsmime.so.1:mimeFirstType
-libcupsmime.so.1:mimeLoad
-libcupsmime.so.1:mimeLoadFilters
-libcupsmime.so.1:mimeLoadTypes
-libcupsmime.so.1:mimeNew
-libcupsmime.so.1:mimeNextFilter
-libcupsmime.so.1:mimeNextType
-libcupsmime.so.1:mimeNumFilters
-libcupsmime.so.1:mimeNumTypes
-libcupsmime.so.1:mimeSetErrorCallback
-libcupsmime.so.1:mimeType
-libcupsppdc.so.1:_ZN10ppdcChoiceC1EPKcS1_S1_
-libcupsppdc.so.1:_ZN10ppdcChoiceC2EPKcS1_S1_
-libcupsppdc.so.1:_ZN10ppdcChoiceD0Ev
-libcupsppdc.so.1:_ZN10ppdcChoiceD1Ev
-libcupsppdc.so.1:_ZN10ppdcChoiceD2Ev
-libcupsppdc.so.1:_ZN10ppdcDriver10find_groupEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver11find_optionEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver11set_versionEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver13set_file_nameEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver14set_model_nameEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver14write_ppd_fileEP12_cups_file_sP11ppdcCatalogP9ppdcArrayP10ppdcSource14ppdcLineEnding
-libcupsppdc.so.1:_ZN10ppdcDriver16set_default_fontEP8ppdcFont
-libcupsppdc.so.1:_ZN10ppdcDriver16set_default_sizeEP13ppdcMediaSize
-libcupsppdc.so.1:_ZN10ppdcDriver16set_manufacturerEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver16set_pc_file_nameEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver17find_option_groupEPKcPP9ppdcGroup
-libcupsppdc.so.1:_ZN10ppdcDriver20set_custom_size_codeEPKc
-libcupsppdc.so.1:_ZN10ppdcDriver9find_attrEPKcS1_
-libcupsppdc.so.1:_ZN10ppdcDriverC1EPS_
-libcupsppdc.so.1:_ZN10ppdcDriverC2EPS_
-libcupsppdc.so.1:_ZN10ppdcDriverD0Ev
-libcupsppdc.so.1:_ZN10ppdcDriverD1Ev
-libcupsppdc.so.1:_ZN10ppdcDriverD2Ev
-libcupsppdc.so.1:_ZN10ppdcFilterC1EPKcS1_i
-libcupsppdc.so.1:_ZN10ppdcFilterC2EPKcS1_i
-libcupsppdc.so.1:_ZN10ppdcFilterD0Ev
-libcupsppdc.so.1:_ZN10ppdcFilterD1Ev
-libcupsppdc.so.1:_ZN10ppdcFilterD2Ev
-libcupsppdc.so.1:_ZN10ppdcOption11find_choiceEPKc
-libcupsppdc.so.1:_ZN10ppdcOption13set_defchoiceEP10ppdcChoice
-libcupsppdc.so.1:_ZN10ppdcOptionC1E11ppdcOptTypePKcS2_14ppdcOptSectionf
-libcupsppdc.so.1:_ZN10ppdcOptionC1EPS_
-libcupsppdc.so.1:_ZN10ppdcOptionC2E11ppdcOptTypePKcS2_14ppdcOptSectionf
-libcupsppdc.so.1:_ZN10ppdcOptionC2EPS_
-libcupsppdc.so.1:_ZN10ppdcOptionD0Ev
-libcupsppdc.so.1:_ZN10ppdcOptionD1Ev
-libcupsppdc.so.1:_ZN10ppdcOptionD2Ev
-libcupsppdc.so.1:_ZN10ppdcShared6retainEv
-libcupsppdc.so.1:_ZN10ppdcShared7releaseEv
-libcupsppdc.so.1:_ZN10ppdcSharedC1Ev
-libcupsppdc.so.1:_ZN10ppdcSharedC2Ev
-libcupsppdc.so.1:_ZN10ppdcSharedD0Ev
-libcupsppdc.so.1:_ZN10ppdcSharedD1Ev
-libcupsppdc.so.1:_ZN10ppdcSharedD2Ev
-libcupsppdc.so.1:_ZN10ppdcSource10get_choiceEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource10get_duplexEP8ppdcFileP10ppdcDriver
-libcupsppdc.so.1:_ZN10ppdcSource10get_filterEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource10get_optionEP8ppdcFileP10ppdcDriverP9ppdcGroup
-libcupsppdc.so.1:_ZN10ppdcSource10import_ppdEPKc
-libcupsppdc.so.1:_ZN10ppdcSource10write_fileEPKc
-libcupsppdc.so.1:_ZN10ppdcSource11add_includeEPKc
-libcupsppdc.so.1:_ZN10ppdcSource11find_driverEPKc
-libcupsppdc.so.1:_ZN10ppdcSource11get_booleanEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource11get_genericEP8ppdcFilePKcS3_S3_
-libcupsppdc.so.1:_ZN10ppdcSource11get_integerEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource11get_integerEPKc
-libcupsppdc.so.1:_ZN10ppdcSource12find_includeEPKcS1_Pci
-libcupsppdc.so.1:_ZN10ppdcSource12get_variableEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource12set_variableEPKcS1_
-libcupsppdc.so.1:_ZN10ppdcSource13find_variableEPKc
-libcupsppdc.so.1:_ZN10ppdcSource14get_constraintEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource14get_resolutionEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_color_modelEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_color_orderEPKc
-libcupsppdc.so.1:_ZN10ppdcSource15get_color_spaceEPKc
-libcupsppdc.so.1:_ZN10ppdcSource15get_custom_sizeEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_installableEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource15get_measurementEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource17get_color_profileEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource18get_simple_profileEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource6get_poEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource6quotefEP12_cups_file_sPKcz
-libcupsppdc.so.1:_ZN10ppdcSource7find_poEPKc
-libcupsppdc.so.1:_ZN10ppdcSource8get_attrEP8ppdcFileb
-libcupsppdc.so.1:_ZN10ppdcSource8get_fontEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource8get_sizeEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource9find_sizeEPKc
-libcupsppdc.so.1:_ZN10ppdcSource9get_floatEP8ppdcFile
-libcupsppdc.so.1:_ZN10ppdcSource9get_groupEP8ppdcFileP10ppdcDriver
-libcupsppdc.so.1:_ZN10ppdcSource9get_tokenEP8ppdcFilePci
-libcupsppdc.so.1:_ZN10ppdcSource9read_fileEPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN10ppdcSource9scan_fileEP8ppdcFileP10ppdcDriverb
-libcupsppdc.so.1:_ZN10ppdcSourceC1EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN10ppdcSourceC2EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN10ppdcSourceD0Ev
-libcupsppdc.so.1:_ZN10ppdcSourceD1Ev
-libcupsppdc.so.1:_ZN10ppdcSourceD2Ev
-libcupsppdc.so.1:_ZN10ppdcStringC1EPKc
-libcupsppdc.so.1:_ZN10ppdcStringC2EPKc
-libcupsppdc.so.1:_ZN10ppdcStringD0Ev
-libcupsppdc.so.1:_ZN10ppdcStringD1Ev
-libcupsppdc.so.1:_ZN10ppdcStringD2Ev
-libcupsppdc.so.1:_ZN11ppdcCatalog11add_messageEPKcS1_
-libcupsppdc.so.1:_ZN11ppdcCatalog12find_messageEPKc
-libcupsppdc.so.1:_ZN11ppdcCatalog13load_messagesEPKc
-libcupsppdc.so.1:_ZN11ppdcCatalog13save_messagesEPKc
-libcupsppdc.so.1:_ZN11ppdcCatalogC1EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcCatalogC2EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcCatalogD0Ev
-libcupsppdc.so.1:_ZN11ppdcCatalogD1Ev
-libcupsppdc.so.1:_ZN11ppdcCatalogD2Ev
-libcupsppdc.so.1:_ZN11ppdcMessageC1EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcMessageC2EPKcS1_
-libcupsppdc.so.1:_ZN11ppdcMessageD0Ev
-libcupsppdc.so.1:_ZN11ppdcMessageD1Ev
-libcupsppdc.so.1:_ZN11ppdcMessageD2Ev
-libcupsppdc.so.1:_ZN11ppdcProfileC1EPKcS1_ffPKf
-libcupsppdc.so.1:_ZN11ppdcProfileC2EPKcS1_ffPKf
-libcupsppdc.so.1:_ZN11ppdcProfileD0Ev
-libcupsppdc.so.1:_ZN11ppdcProfileD1Ev
-libcupsppdc.so.1:_ZN11ppdcProfileD2Ev
-libcupsppdc.so.1:_ZN12ppdcVariable9set_valueEPKc
-libcupsppdc.so.1:_ZN12ppdcVariableC1EPKcS1_
-libcupsppdc.so.1:_ZN12ppdcVariableC2EPKcS1_
-libcupsppdc.so.1:_ZN12ppdcVariableD0Ev
-libcupsppdc.so.1:_ZN12ppdcVariableD1Ev
-libcupsppdc.so.1:_ZN12ppdcVariableD2Ev
-libcupsppdc.so.1:_ZN13ppdcMediaSizeC1EPKcS1_ffffffS1_S1_
-libcupsppdc.so.1:_ZN13ppdcMediaSizeC2EPKcS1_ffffffS1_S1_
-libcupsppdc.so.1:_ZN13ppdcMediaSizeD0Ev
-libcupsppdc.so.1:_ZN13ppdcMediaSizeD1Ev
-libcupsppdc.so.1:_ZN13ppdcMediaSizeD2Ev
-libcupsppdc.so.1:_ZN14ppdcConstraintC1EPKcS1_S1_S1_
-libcupsppdc.so.1:_ZN14ppdcConstraintC2EPKcS1_S1_S1_
-libcupsppdc.so.1:_ZN14ppdcConstraintD0Ev
-libcupsppdc.so.1:_ZN14ppdcConstraintD1Ev
-libcupsppdc.so.1:_ZN14ppdcConstraintD2Ev
-libcupsppdc.so.1:_ZN8ppdcAttrC1EPKcS1_S1_S1_b
-libcupsppdc.so.1:_ZN8ppdcAttrC2EPKcS1_S1_S1_b
-libcupsppdc.so.1:_ZN8ppdcAttrD0Ev
-libcupsppdc.so.1:_ZN8ppdcAttrD1Ev
-libcupsppdc.so.1:_ZN8ppdcAttrD2Ev
-libcupsppdc.so.1:_ZN8ppdcFile3getEv
-libcupsppdc.so.1:_ZN8ppdcFile4peekEv
-libcupsppdc.so.1:_ZN8ppdcFileC1EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN8ppdcFileC2EPKcP12_cups_file_s
-libcupsppdc.so.1:_ZN8ppdcFileD1Ev
-libcupsppdc.so.1:_ZN8ppdcFileD2Ev
-libcupsppdc.so.1:_ZN8ppdcFontC1EPKcS1_S1_S1_14ppdcFontStatus
-libcupsppdc.so.1:_ZN8ppdcFontC2EPKcS1_S1_S1_14ppdcFontStatus
-libcupsppdc.so.1:_ZN8ppdcFontD0Ev
-libcupsppdc.so.1:_ZN8ppdcFontD1Ev
-libcupsppdc.so.1:_ZN8ppdcFontD2Ev
-libcupsppdc.so.1:_ZN9ppdcArray3addEP10ppdcShared
-libcupsppdc.so.1:_ZN9ppdcArray4nextEv
-libcupsppdc.so.1:_ZN9ppdcArray5firstEv
-libcupsppdc.so.1:_ZN9ppdcArray6removeEP10ppdcShared
-libcupsppdc.so.1:_ZN9ppdcArrayC1EPS_
-libcupsppdc.so.1:_ZN9ppdcArrayC2EPS_
-libcupsppdc.so.1:_ZN9ppdcArrayD0Ev
-libcupsppdc.so.1:_ZN9ppdcArrayD1Ev
-libcupsppdc.so.1:_ZN9ppdcArrayD2Ev
-libcupsppdc.so.1:_ZN9ppdcGroup11find_optionEPKc
-libcupsppdc.so.1:_ZN9ppdcGroupC1EPKcS1_
-libcupsppdc.so.1:_ZN9ppdcGroupC1EPS_
-libcupsppdc.so.1:_ZN9ppdcGroupC2EPKcS1_
-libcupsppdc.so.1:_ZN9ppdcGroupC2EPS_
-libcupsppdc.so.1:_ZN9ppdcGroupD0Ev
-libcupsppdc.so.1:_ZN9ppdcGroupD1Ev
-libcupsppdc.so.1:_ZN9ppdcGroupD2Ev
diff --git a/abi_used_libs32 b/abi_used_libs32
--- a/abi_used_libs32
+++ b/abi_used_libs32
@@ -1,6 +1,4 @@
libc.so.6
-libgcc_s.so.1
libgnutls.so.30
libm.so.6
libpthread.so.0
-libstdc++.so.6
diff --git a/files/cups-fix-install-perms.patch b/files/cups-fix-install-perms.patch
--- a/files/cups-fix-install-perms.patch
+++ b/files/cups-fix-install-perms.patch
@@ -1,6 +1,6 @@
--- Makedefs.in 2017-10-13 20:22:26.000000000 +0200
+++ Makedefs.in.new 2017-10-13 21:35:07.435842127 +0200
-@@ -48,14 +48,14 @@
+@@ -45,14 +45,14 @@ SHELL = /bin/sh
# Installation programs...
#
diff --git a/files/cups-ippeve-webui.patch b/files/cups-ippeve-webui.patch
deleted file mode 100644
--- a/files/cups-ippeve-webui.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/backend/dnssd.c b/backend/dnssd.c
-index 34781d5ce..7074f4294 100644
---- a/backend/dnssd.c
-+++ b/backend/dnssd.c
-@@ -1252,6 +1252,13 @@ query_callback(
- strlcat(make_and_model, " ", sizeof(make_and_model));
- strlcat(make_and_model, model, sizeof(make_and_model));
-
-+ if (!_cups_strncasecmp(make_and_model, "EPSON EPSON ", 12))
-+ _cups_strcpy(make_and_model, make_and_model + 6);
-+ else if (!_cups_strncasecmp(make_and_model, "HP HP ", 6))
-+ _cups_strcpy(make_and_model, make_and_model + 3);
-+ else if (!_cups_strncasecmp(make_and_model, "Lexmark International Lexmark ", 30))
-+ _cups_strcpy(make_and_model, make_and_model + 22);
-+
- device->make_and_model = strdup(make_and_model);
- }
- else
-diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
-index f788083fb..a3b5057b0 100644
---- a/cgi-bin/admin.c
-+++ b/cgi-bin/admin.c
-@@ -928,6 +929,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
- else if (!file &&
- (!cgiGetVariable("PPD_NAME") || cgiGetVariable("SELECT_MAKE")))
- {
-+ int ipp_everywhere = !strncmp(var, "ipp://", 6) || !strncmp(var, "ipps://", 7) || (!strncmp(var, "dnssd://", 8) && (strstr(var, "_ipp._tcp") || strstr(var, "_ipps._tcp")));
-+
- if (modify && !cgiGetVariable("SELECT_MAKE"))
- {
- /*
-@@ -1076,6 +1079,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
- if (!modify)
- cgiSetVariable("CURRENT_MAKE_AND_MODEL",
- cgiGetArray("PPD_MAKE_AND_MODEL", 0));
-+ if (ipp_everywhere)
-+ cgiSetVariable("SHOW_IPP_EVERYWHERE", "1");
- cgiCopyTemplateLang("choose-model.tmpl");
- cgiEndHTML();
- }
-diff --git a/templates/choose-model.tmpl b/templates/choose-model.tmpl
-index ee9338cc5..d72534236 100644
---- a/templates/choose-model.tmpl
-+++ b/templates/choose-model.tmpl
-@@ -39,6 +39,7 @@
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Current Driver - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
-diff --git a/templates/de/choose-model.tmpl b/templates/de/choose-model.tmpl
-index cb9b6f3bc..a08a8e3e0 100644
---- a/templates/de/choose-model.tmpl
-+++ b/templates/de/choose-model.tmpl
-@@ -39,6 +39,7 @@ Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netzwerk fr
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Aktueller Treiber - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
-diff --git a/templates/es/choose-model.tmpl b/templates/es/choose-model.tmpl
-index 8a5a4ba90..74f0a9bb9 100644
---- a/templates/es/choose-model.tmpl
-+++ b/templates/es/choose-model.tmpl
-@@ -39,6 +39,7 @@
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Controlador actual - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
-diff --git a/templates/fr/choose-model.tmpl b/templates/fr/choose-model.tmpl
-index 1e154f18a..3038b3fe3 100644
---- a/templates/fr/choose-model.tmpl
-+++ b/templates/fr/choose-model.tmpl
-@@ -39,6 +39,7 @@
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Pilote actuel - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
-diff --git a/templates/ja/choose-model.tmpl b/templates/ja/choose-model.tmpl
-index daf1375fd..b3c286b11 100644
---- a/templates/ja/choose-model.tmpl
-+++ b/templates/ja/choose-model.tmpl
-@@ -39,6 +39,7 @@
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>現在のドライバー - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
-diff --git a/templates/pt_BR/choose-model.tmpl b/templates/pt_BR/choose-model.tmpl
-index 55d8bd8d5..a5939ee9c 100644
---- a/templates/pt_BR/choose-model.tmpl
-+++ b/templates/pt_BR/choose-model.tmpl
-@@ -39,6 +39,7 @@
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Driver atual - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
-diff --git a/templates/ru/choose-model.tmpl b/templates/ru/choose-model.tmpl
-index 2f0d6d9ba..86507814d 100644
---- a/templates/ru/choose-model.tmpl
-+++ b/templates/ru/choose-model.tmpl
-@@ -39,6 +39,7 @@
- <TD>
- <SELECT NAME="PPD_NAME" SIZE="10">
- {op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Текущий драйвер - {current_make_and_model}</OPTION>:}
-+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere &trade;</OPTION>:}
- {[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
- }</SELECT>
- </TD>
diff --git a/files/cups-ippvalidateattr-regression.patch b/files/cups-ippvalidateattr-regression.patch
deleted file mode 100644
--- a/files/cups-ippvalidateattr-regression.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/cups/ipp.c b/cups/ipp.c
-index 95d53cc44..325de02b9 100644
---- a/cups/ipp.c
-+++ b/cups/ipp.c
-@@ -5033,16 +5033,19 @@ ippValidateAttribute(
- break;
- }
-
-- if (*ptr < ' ' || *ptr == 0x7f)
-- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-- else if (*ptr)
-- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-+ if (*ptr)
-+ {
-+ if (*ptr < ' ' || *ptr == 0x7f)
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ else
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ }
-
- if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1))
- {
-@@ -5091,16 +5094,19 @@ ippValidateAttribute(
- break;
- }
-
-- if (*ptr < ' ' || *ptr == 0x7f)
-- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-- else if (*ptr)
-+ if (*ptr)
- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-+ if (*ptr < ' ' || *ptr == 0x7f)
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ else
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ }
-
- if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1))
- {
diff --git a/files/cups-systemd-socket.patch b/files/cups-systemd-socket.patch
--- a/files/cups-systemd-socket.patch
+++ b/files/cups-systemd-socket.patch
@@ -1,10 +1,12 @@
-diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c
---- cups-2.2.8/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/main.c 2018-06-08 17:32:39.417600671 +0200
-@@ -681,8 +681,16 @@ main(int argc, /* I - Number of comm
+diff -up cups-2.3.1/scheduler/main.c.systemd-socket cups-2.3.1/scheduler/main.c
+--- cups-2.3.1/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200
++++ cups-2.3.1/scheduler/main.c 2018-06-08 17:32:39.417600671 +0200
+@@ -680,9 +680,16 @@ main(int argc, /* I - Number of command-line args */
+ */
#ifdef HAVE_ONDEMAND
- if (OnDemand)
+- if (OnDemand)
++ if (OnDemand)
+ {
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
- else
@@ -15,13 +17,12 @@
+ (unsigned long) getpid());
+# endif /* HAVE_SYSTEMD */
+ } else
-+
#endif /* HAVE_ONDEMAND */
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.path.in
---- cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200
-+++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-06-08 17:32:39.417600671 +0200
+diff -up cups-2.3.1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.3.1/scheduler/org.cups.cupsd.path.in
+--- cups-2.3.1/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200
++++ cups-2.3.1/scheduler/org.cups.cupsd.path.in 2018-06-08 17:32:39.417600671 +0200
@@ -3,7 +3,7 @@ Description=CUPS Scheduler
PartOf=org.cups.cupsd.service
@@ -31,14 +32,10 @@
[Install]
WantedBy=multi-user.target
-diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.service.in
---- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-08 17:32:39.417600671 +0200
-+++ cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-06-08 17:34:09.091888847 +0200
-@@ -1,10 +1,11 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
-+After=network.target
+diff -up cups-2.3.1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.3.1/scheduler/org.cups.cupsd.service.in
+--- cups-2.3.1/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-08 17:32:39.417600671 +0200
++++ cups-2.3.1/scheduler/org.cups.cupsd.service.in 2018-06-08 17:34:09.091888847 +0200
+@@ -5,7 +5,7 @@ After=sssd.service
[Service]
ExecStart=@sbindir@/cupsd -l
diff --git a/files/security/CVE-2018-4700.patch b/files/security/CVE-2018-4700.patch
deleted file mode 100644
--- a/files/security/CVE-2018-4700.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b9ff93ce913ff633a3f667317e5a81fa7fe0d5d3 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Fri, 7 Dec 2018 12:08:27 -0500
-Subject: [PATCH] CVE-2018-4700: Linux session cookies used a predictable
- random number seed.
-
----
- cgi-bin/var.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/cgi-bin/var.c b/cgi-bin/var.c
-index 316b67f05..12f3c8344 100644
---- a/cgi-bin/var.c
-+++ b/cgi-bin/var.c
-@@ -1186,6 +1186,7 @@ cgi_set_sid(void)
- const char *remote_addr, /* REMOTE_ADDR */
- *server_name, /* SERVER_NAME */
- *server_port; /* SERVER_PORT */
-+ struct timeval curtime; /* Current time */
-
-
- if ((remote_addr = getenv("REMOTE_ADDR")) == NULL)
-@@ -1195,7 +1196,8 @@ cgi_set_sid(void)
- if ((server_port = getenv("SERVER_PORT")) == NULL)
- server_port = "SERVER_PORT";
-
-- CUPS_SRAND(time(NULL));
-+ gettimeofday(&curtime, NULL);
-+ CUPS_SRAND(curtime.tv_sec + curtime.tv_usec);
- snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X",
- remote_addr, server_name, server_port,
- (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255,
diff --git a/files/security/CVE-2019-8675.nopatch b/files/security/CVE-2019-8675.nopatch
deleted file mode 100644
diff --git a/files/security/CVE-2019-8696.patch b/files/security/CVE-2019-8696.patch
deleted file mode 100644
--- a/files/security/CVE-2019-8696.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From f24e6cf6a39300ad0c3726a41a4aab51ad54c109 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Thu, 15 Aug 2019 14:08:31 -0400
-Subject: [PATCH] Fix multiple security/disclosure issues:
-
-- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows (rdar://51685251)
-- Fixed IPP buffer overflow (rdar://50035411)
-- Fixed memory disclosure issue in the scheduler (rdar://51373853)
-- Fixed DoS issues in the scheduler (rdar://51373929)
----
- cups/http.c | 9 +++++++--
- cups/ipp.c | 9 ++-------
- cups/snmp.c | 20 +++++++++++++++++++-
- scheduler/client.c | 23 ++++++++++++-----------
- 4 files changed, 40 insertions(+), 21 deletions(-)
-
-diff --git a/cups/http.c b/cups/http.c
-index 5c14ef68e..3fadb5acb 100644
---- a/cups/http.c
-+++ b/cups/http.c
-@@ -1905,7 +1905,7 @@ httpPrintf(http_t *http, /* I - HTTP connection */
- ...) /* I - Additional args as needed */
- {
- ssize_t bytes; /* Number of bytes to write */
-- char buf[16384]; /* Buffer for formatted string */
-+ char buf[65536]; /* Buffer for formatted string */
- va_list ap; /* Variable argument pointer */
-
-
-@@ -1917,7 +1917,12 @@ httpPrintf(http_t *http, /* I - HTTP connection */
-
- DEBUG_printf(("3httpPrintf: (" CUPS_LLFMT " bytes) %s", CUPS_LLCAST bytes, buf));
-
-- if (http->data_encoding == HTTP_ENCODING_FIELDS)
-+ if (bytes > (ssize_t)(sizeof(buf) - 1))
-+ {
-+ http->error = ENOMEM;
-+ return (-1);
-+ }
-+ else if (http->data_encoding == HTTP_ENCODING_FIELDS)
- return ((int)httpWrite2(http, buf, (size_t)bytes));
- else
- {
-diff --git a/cups/ipp.c b/cups/ipp.c
-index eaa8c78ca..b0762fdcb 100644
---- a/cups/ipp.c
-+++ b/cups/ipp.c
-@@ -4553,9 +4553,7 @@ ippSetValueTag(
- break;
-
- case IPP_TAG_NAME :
-- if (temp_tag != IPP_TAG_KEYWORD && temp_tag != IPP_TAG_URI &&
-- temp_tag != IPP_TAG_URISCHEME && temp_tag != IPP_TAG_LANGUAGE &&
-- temp_tag != IPP_TAG_MIMETYPE)
-+ if (temp_tag != IPP_TAG_KEYWORD)
- return (0);
-
- (*attr)->value_tag = (ipp_tag_t)(IPP_TAG_NAME | ((*attr)->value_tag & IPP_TAG_CUPS_CONST));
-@@ -4563,10 +4561,7 @@ ippSetValueTag(
-
- case IPP_TAG_NAMELANG :
- case IPP_TAG_TEXTLANG :
-- if (value_tag == IPP_TAG_NAMELANG &&
-- (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD &&
-- temp_tag != IPP_TAG_URI && temp_tag != IPP_TAG_URISCHEME &&
-- temp_tag != IPP_TAG_LANGUAGE && temp_tag != IPP_TAG_MIMETYPE))
-+ if (value_tag == IPP_TAG_NAMELANG && (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD))
- return (0);
-
- if (value_tag == IPP_TAG_TEXTLANG && temp_tag != IPP_TAG_TEXT)
-diff --git a/cups/snmp.c b/cups/snmp.c
-index 8437528dd..fc9396177 100644
---- a/cups/snmp.c
-+++ b/cups/snmp.c
-@@ -1233,6 +1233,9 @@ asn1_get_integer(
- int value; /* Integer value */
-
-
-+ if (*buffer >= bufend)
-+ return (0);
-+
- if (length > sizeof(int))
- {
- (*buffer) += length;
-@@ -1259,6 +1262,9 @@ asn1_get_length(unsigned char **buffer, /* IO - Pointer in buffer */
- unsigned length; /* Length */
-
-
-+ if (*buffer >= bufend)
-+ return (0);
-+
- length = **buffer;
- (*buffer) ++;
-
-@@ -1301,6 +1307,9 @@ asn1_get_oid(
- int number; /* OID number */
-
-
-+ if (*buffer >= bufend)
-+ return (0);
-+
- valend = *buffer + length;
- oidptr = oid;
- oidend = oid + oidsize - 1;
-@@ -1349,9 +1358,12 @@ asn1_get_packed(
- int value; /* Value */
-
-
-+ if (*buffer >= bufend)
-+ return (0);
-+
- value = 0;
-
-- while ((**buffer & 128) && *buffer < bufend)
-+ while (*buffer < bufend && (**buffer & 128))
- {
- value = (value << 7) | (**buffer & 127);
- (*buffer) ++;
-@@ -1379,6 +1391,9 @@ asn1_get_string(
- char *string, /* I - String buffer */
- size_t strsize) /* I - String buffer size */
- {
-+ if (*buffer >= bufend)
-+ return (NULL);
-+
- if (length > (unsigned)(bufend - *buffer))
- length = (unsigned)(bufend - *buffer);
-
-@@ -1421,6 +1436,9 @@ asn1_get_type(unsigned char **buffer, /* IO - Pointer in buffer */
- int type; /* Type */
-
-
-+ if (*buffer >= bufend)
-+ return (0);
-+
- type = **buffer;
- (*buffer) ++;
-
-diff --git a/scheduler/client.c b/scheduler/client.c
-index a21b909a8..680508047 100644
---- a/scheduler/client.c
-+++ b/scheduler/client.c
-@@ -568,6 +568,17 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */
-
- cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdReadClient: error=%d, used=%d, state=%s, data_encoding=HTTP_ENCODING_%s, data_remaining=" CUPS_LLFMT ", request=%p(%s), file=%d", httpError(con->http), (int)httpGetReady(con->http), httpStateString(httpGetState(con->http)), httpIsChunked(con->http) ? "CHUNKED" : "LENGTH", CUPS_LLCAST httpGetRemaining(con->http), con->request, con->request ? ippStateString(ippGetState(con->request)) : "", con->file);
-
-+ if (httpError(con->http) == EPIPE && !httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
-+ {
-+ /*
-+ * Connection closed...
-+ */
-+
-+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
-+ cupsdCloseClient(con);
-+ return;
-+ }
-+
- if (httpGetState(con->http) == HTTP_STATE_GET_SEND ||
- httpGetState(con->http) == HTTP_STATE_POST_SEND ||
- httpGetState(con->http) == HTTP_STATE_STATUS)
-@@ -577,17 +588,6 @@ cupsdReadClient(cupsd_client_t *con) /* I - Client to read from */
- * connection and we need to shut it down...
- */
-
-- if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
-- {
-- /*
-- * Connection closed...
-- */
--
-- cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
-- cupsdCloseClient(con);
-- return;
-- }
--
- cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.", httpStateString(httpGetState(con->http)));
- cupsdCloseClient(con);
- return;
-@@ -2209,6 +2209,7 @@ cupsdSendError(cupsd_client_t *con, /* I - Connection */
- strlcpy(location, httpGetField(con->http, HTTP_FIELD_LOCATION), sizeof(location));
-
- httpClearFields(con->http);
-+ httpClearCookie(con->http);
-
- httpSetField(con->http, HTTP_FIELD_LOCATION, location);
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : cups
-version : 2.2.8
-release : 24
+version : 2.3.1
+release : 25
source :
- - https://github.com/apple/cups/releases/download/v2.2.8/cups-2.2.8-source.tar.gz : 3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4
+ - https://github.com/apple/cups/releases/download/v2.3.1/cups-2.3.1-source.tar.gz : 1bca9d89507e3f68cbc84482fe46ae8d5333af5bc2b9061347b2007182ac77ce
homepage : https://www.cups.org/
license : Apache-2.0
component : desktop.core
@@ -32,13 +32,6 @@
setup : |
%patch -p0 < $pkgfiles/cups-fix-install-perms.patch
%patch -p1 < $pkgfiles/cups-systemd-socket.patch
- %patch -p1 < $pkgfiles/security/CVE-2018-4700.patch
- %patch -p1 < $pkgfiles/security/CVE-2019-8696.patch
-
- # https://github.com/apple/cups/issues/5330 and https://github.com/apple/cups/issues/5322
- %patch -p1 < $pkgfiles/cups-ippvalidateattr-regression.patch
- # https://github.com/apple/cups/issues/5338
- %patch -p1 < $pkgfiles/cups-ippeve-webui.patch
# Remove ".SILENT" rule for verbose output (bug #524338)
sed -i 's#^.SILENT:##g' Makedefs.in
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>cups</Name>
<Homepage>https://www.cups.org/</Homepage>
<Packager>
- <Name>Pierre-Yves</Name>
- <Email>pyu@riseup.net</Email>
+ <Name>Fernando Monteiro</Name>
+ <Email>fr02monteiro@gmail.com</Email>
</Packager>
<License>Apache-2.0</License>
<PartOf>desktop.core</PartOf>
@@ -33,8 +33,8 @@
<Path fileType="config">/etc/cups/ssl</Path>
<Path fileType="config">/etc/dbus-1/system.d/cups.conf</Path>
<Path fileType="executable">/usr/bin/cancel</Path>
- <Path fileType="executable">/usr/bin/cupstestdsc</Path>
<Path fileType="executable">/usr/bin/cupstestppd</Path>
+ <Path fileType="executable">/usr/bin/ippeveprinter</Path>
<Path fileType="executable">/usr/bin/ippfind</Path>
<Path fileType="executable">/usr/bin/ipptool</Path>
<Path fileType="executable">/usr/bin/lp</Path>
@@ -62,6 +62,8 @@
<Path fileType="library">/usr/lib/cups/cgi-bin/help.cgi</Path>
<Path fileType="library">/usr/lib/cups/cgi-bin/jobs.cgi</Path>
<Path fileType="library">/usr/lib/cups/cgi-bin/printers.cgi</Path>
+ <Path fileType="library">/usr/lib/cups/command/ippevepcl</Path>
+ <Path fileType="library">/usr/lib/cups/command/ippeveps</Path>
<Path fileType="library">/usr/lib/cups/daemon/cups-deviced</Path>
<Path fileType="library">/usr/lib/cups/daemon/cups-driverd</Path>
<Path fileType="library">/usr/lib/cups/daemon/cups-exec</Path>
@@ -70,7 +72,6 @@
<Path fileType="library">/usr/lib/cups/filter/commandtops</Path>
<Path fileType="library">/usr/lib/cups/filter/gziptoany</Path>
<Path fileType="library">/usr/lib/cups/filter/pstops</Path>
- <Path fileType="library">/usr/lib/cups/filter/rastertodymo</Path>
<Path fileType="library">/usr/lib/cups/filter/rastertoepson</Path>
<Path fileType="library">/usr/lib/cups/filter/rastertohp</Path>
<Path fileType="library">/usr/lib/cups/filter/rastertolabel</Path>
@@ -89,15 +90,10 @@
<Path fileType="library">/usr/lib/systemd/system/printer.target.wants/org.cups.cupsd.service</Path>
<Path fileType="library">/usr/lib/systemd/system/sockets.target.wants/org.cups.cupsd.socket</Path>
<Path fileType="library">/usr/lib64/libcups.so.2</Path>
- <Path fileType="library">/usr/lib64/libcupscgi.so.1</Path>
<Path fileType="library">/usr/lib64/libcupsimage.so.2</Path>
- <Path fileType="library">/usr/lib64/libcupsmime.so.1</Path>
- <Path fileType="library">/usr/lib64/libcupsppdc.so.1</Path>
<Path fileType="library">/usr/lib64/sysusers.d/cups.conf</Path>
<Path fileType="library">/usr/lib64/tmpfiles.d/cups.conf</Path>
- <Path fileType="executable">/usr/sbin/accept</Path>
<Path fileType="executable">/usr/sbin/cupsaccept</Path>
- <Path fileType="executable">/usr/sbin/cupsaddsmb</Path>
<Path fileType="executable">/usr/sbin/cupsctl</Path>
<Path fileType="executable">/usr/sbin/cupsd</Path>
<Path fileType="executable">/usr/sbin/cupsdisable</Path>
@@ -108,7 +104,6 @@
<Path fileType="executable">/usr/sbin/lpc</Path>
<Path fileType="executable">/usr/sbin/lpinfo</Path>
<Path fileType="executable">/usr/sbin/lpmove</Path>
- <Path fileType="executable">/usr/sbin/reject</Path>
<Path fileType="data">/usr/share/cups/banners</Path>
<Path fileType="data">/usr/share/cups/data</Path>
<Path fileType="data">/usr/share/cups/drv/sample.drv</Path>
@@ -123,30 +118,66 @@
<Path fileType="data">/usr/share/cups/examples/r300-basic.drv</Path>
<Path fileType="data">/usr/share/cups/examples/r300-colorman.drv</Path>
<Path fileType="data">/usr/share/cups/examples/r300-remote.drv</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/cancel-current-job.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/color.jpg</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/create-job-format.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/create-job-sheets.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/create-job-timeout.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/create-job.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/create-printer-subscription.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/cups-create-local-printer.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/document-a4.pdf</Path>
<Path fileType="data">/usr/share/cups/ipptool/document-a4.ps</Path>
<Path fileType="data">/usr/share/cups/ipptool/document-letter.pdf</Path>
<Path fileType="data">/usr/share/cups/ipptool/document-letter.ps</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/fax-job.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/get-completed-jobs.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-devices.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-job-attributes.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-job-attributes2.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-job-template-attributes.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/get-jobs.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/get-notifications.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppd-printer.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppd.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds-drv-only.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds-language.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds-make-and-model.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds-make.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds-product.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds-psversion.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-ppds.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-printer-attributes-suite.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/get-printer-attributes.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-printer-description-attributes.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-printers-printer-id.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/get-printers.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/get-subscriptions.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/gray.jpg</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/identify-printer-display.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/identify-printer-multiple.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/identify-printer.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/ipp-1.1.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/ipp-2.0.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/ipp-2.1.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/ipp-2.2.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/ipp-backend.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/ipp-everywhere.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/onepage-a4.pdf</Path>
<Path fileType="data">/usr/share/cups/ipptool/onepage-a4.ps</Path>
<Path fileType="data">/usr/share/cups/ipptool/onepage-letter.pdf</Path>
<Path fileType="data">/usr/share/cups/ipptool/onepage-letter.ps</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-job-and-wait.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/print-job-deflate.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/print-job-gzip.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-job-hold.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-job-letter.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-job-manual.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-job-media-col.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-job-password.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/print-job.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/print-uri.test</Path>
+ <Path fileType="data">/usr/share/cups/ipptool/set-attrs-hold.test</Path>
<Path fileType="data">/usr/share/cups/ipptool/testfile.jpg</Path>
<Path fileType="data">/usr/share/cups/ipptool/testfile.pcl</Path>
<Path fileType="data">/usr/share/cups/ipptool/testfile.pdf</Path>
@@ -167,7 +198,6 @@
<Path fileType="data">/usr/share/cups/profiles</Path>
<Path fileType="data">/usr/share/cups/templates/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/choose-make.tmpl</Path>
@@ -185,7 +215,6 @@
<Path fileType="data">/usr/share/cups/templates/command.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/de/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/choose-make.tmpl</Path>
@@ -243,13 +272,9 @@
<Path fileType="data">/usr/share/cups/templates/de/printers-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/restart.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/de/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/de/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/de/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/de/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/de/users.tmpl</Path>
@@ -258,7 +283,6 @@
<Path fileType="data">/usr/share/cups/templates/error.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/es/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/choose-make.tmpl</Path>
@@ -316,19 +340,14 @@
<Path fileType="data">/usr/share/cups/templates/es/printers-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/restart.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/es/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/es/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/es/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/es/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/es/users.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/fr/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/choose-make.tmpl</Path>
@@ -386,13 +405,9 @@
<Path fileType="data">/usr/share/cups/templates/fr/printers-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/restart.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/fr/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/fr/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/fr/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/fr/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/fr/users.tmpl</Path>
@@ -402,7 +417,6 @@
<Path fileType="data">/usr/share/cups/templates/help-trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ja/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/choose-make.tmpl</Path>
@@ -460,13 +474,9 @@
<Path fileType="data">/usr/share/cups/templates/ja/printers-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/restart.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ja/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ja/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ja/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ja/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ja/users.tmpl</Path>
@@ -506,7 +516,6 @@
<Path fileType="data">/usr/share/cups/templates/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/pt_BR/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/choose-make.tmpl</Path>
@@ -564,20 +573,15 @@
<Path fileType="data">/usr/share/cups/templates/pt_BR/printers-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/restart.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/pt_BR/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/pt_BR/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/pt_BR/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/pt_BR/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/pt_BR/users.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/restart.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/add-class.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/add-printer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ru/add-rss-subscription.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/admin.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/choose-device.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/choose-make.tmpl</Path>
@@ -635,23 +639,15 @@
<Path fileType="data">/usr/share/cups/templates/ru/printers-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/printers.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/restart.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ru/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ru/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ru/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/ru/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/ru/users.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/samba-export.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/samba-exported.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/search.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/set-printer-options-header.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/set-printer-options-trailer.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/subscription-added.tmpl</Path>
- <Path fileType="data">/usr/share/cups/templates/subscription-canceled.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/test-page.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/trailer.tmpl</Path>
<Path fileType="data">/usr/share/cups/templates/users.tmpl</Path>
@@ -664,6 +660,7 @@
<Path fileType="doc">/usr/share/doc/cups/de/index.html</Path>
<Path fileType="doc">/usr/share/doc/cups/es/index.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/accounting.html</Path>
+ <Path fileType="doc">/usr/share/doc/cups/help/admin.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/api-admin.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/api-filter.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/api-ppd.html</Path>
@@ -671,6 +668,7 @@
<Path fileType="doc">/usr/share/doc/cups/help/cgi.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/cupspm.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/encryption.html</Path>
+ <Path fileType="doc">/usr/share/doc/cups/help/firewalls.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/glossary.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/kerberos.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/license.html</Path>
@@ -684,15 +682,16 @@
<Path fileType="doc">/usr/share/doc/cups/help/man-cups-snmp.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cups.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupsaccept.html</Path>
- <Path fileType="doc">/usr/share/doc/cups/help/man-cupsaddsmb.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupsd-helper.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupsd-logs.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupsd.conf.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupsd.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupsenable.html</Path>
- <Path fileType="doc">/usr/share/doc/cups/help/man-cupstestdsc.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-cupstestppd.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-filter.html</Path>
+ <Path fileType="doc">/usr/share/doc/cups/help/man-ippevepcl.html</Path>
+ <Path fileType="doc">/usr/share/doc/cups/help/man-ippeveprinter.html</Path>
+ <Path fileType="doc">/usr/share/doc/cups/help/man-ippfind.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-ipptool.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-ipptoolfile.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/man-lp.html</Path>
@@ -729,8 +728,6 @@
<Path fileType="doc">/usr/share/doc/cups/help/spec-command.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/spec-design.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/spec-ipp.html</Path>
- <Path fileType="doc">/usr/share/doc/cups/help/spec-pdf.html</Path>
- <Path fileType="doc">/usr/share/doc/cups/help/spec-postscript.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/spec-ppd.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/spec-raster.html</Path>
<Path fileType="doc">/usr/share/doc/cups/help/spec-stp.html</Path>
@@ -760,6 +757,7 @@
<Path fileType="localedata">/usr/share/locale/ca/cups_ca.po</Path>
<Path fileType="localedata">/usr/share/locale/cs/cups_cs.po</Path>
<Path fileType="localedata">/usr/share/locale/de/cups_de.po</Path>
+ <Path fileType="localedata">/usr/share/locale/en/cups_en.po</Path>
<Path fileType="localedata">/usr/share/locale/es/cups_es.po</Path>
<Path fileType="localedata">/usr/share/locale/fr/cups_fr.po</Path>
<Path fileType="localedata">/usr/share/locale/it/cups_it.po</Path>
@@ -767,59 +765,58 @@
<Path fileType="localedata">/usr/share/locale/pt_BR/cups_pt_BR.po</Path>
<Path fileType="localedata">/usr/share/locale/ru/cups_ru.po</Path>
<Path fileType="localedata">/usr/share/locale/zh_CN/cups_zh_CN.po</Path>
- <Path fileType="man">/usr/share/man/man1/cancel.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/cups.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/cupstestdsc.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/cupstestppd.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ippfind.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ipptool.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/lp.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/lpoptions.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/lpq.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/lpr.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/lprm.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/lpstat.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ppdc.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ppdhtml.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ppdi.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ppdmerge.1.gz</Path>
- <Path fileType="man">/usr/share/man/man1/ppdpo.1.gz</Path>
- <Path fileType="man">/usr/share/man/man5/classes.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/client.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/cups-files.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/cups-snmp.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/cupsd-logs.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/cupsd.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/ipptoolfile.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/mailto.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/mime.convs.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/mime.types.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/ppdcfile.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/printers.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man5/subscriptions.conf.5.gz</Path>
- <Path fileType="man">/usr/share/man/man7/backend.7.gz</Path>
- <Path fileType="man">/usr/share/man/man7/filter.7.gz</Path>
- <Path fileType="man">/usr/share/man/man7/notifier.7.gz</Path>
- <Path fileType="man">/usr/share/man/man8/accept.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cups-deviced.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cups-driverd.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cups-exec.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cups-lpd.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cups-snmp.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsaccept.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsaddsmb.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsctl.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsd-helper.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsd.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsdisable.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsenable.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsfilter.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/cupsreject.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/lpadmin.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/lpc.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/lpinfo.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/lpmove.8.gz</Path>
- <Path fileType="man">/usr/share/man/man8/reject.8.gz</Path>
+ <Path fileType="man">/usr/share/man/man1/cancel.1</Path>
+ <Path fileType="man">/usr/share/man/man1/cups.1</Path>
+ <Path fileType="man">/usr/share/man/man1/cupstestppd.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ippeveprinter.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ippfind.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ipptool.1</Path>
+ <Path fileType="man">/usr/share/man/man1/lp.1</Path>
+ <Path fileType="man">/usr/share/man/man1/lpoptions.1</Path>
+ <Path fileType="man">/usr/share/man/man1/lpq.1</Path>
+ <Path fileType="man">/usr/share/man/man1/lpr.1</Path>
+ <Path fileType="man">/usr/share/man/man1/lprm.1</Path>
+ <Path fileType="man">/usr/share/man/man1/lpstat.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ppdc.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ppdhtml.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ppdi.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ppdmerge.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ppdpo.1</Path>
+ <Path fileType="man">/usr/share/man/man5/classes.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/client.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/cups-files.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/cups-snmp.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/cupsd-logs.5</Path>
+ <Path fileType="man">/usr/share/man/man5/cupsd.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/ipptoolfile.5</Path>
+ <Path fileType="man">/usr/share/man/man5/mailto.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/mime.convs.5</Path>
+ <Path fileType="man">/usr/share/man/man5/mime.types.5</Path>
+ <Path fileType="man">/usr/share/man/man5/ppdcfile.5</Path>
+ <Path fileType="man">/usr/share/man/man5/printers.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man5/subscriptions.conf.5</Path>
+ <Path fileType="man">/usr/share/man/man7/backend.7</Path>
+ <Path fileType="man">/usr/share/man/man7/filter.7</Path>
+ <Path fileType="man">/usr/share/man/man7/ippevepcl.7</Path>
+ <Path fileType="man">/usr/share/man/man7/ippeveps.7</Path>
+ <Path fileType="man">/usr/share/man/man7/notifier.7</Path>
+ <Path fileType="man">/usr/share/man/man8/cups-deviced.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cups-driverd.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cups-exec.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cups-lpd.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cups-snmp.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsaccept.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsctl.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsd-helper.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsd.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsdisable.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsenable.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsfilter.8</Path>
+ <Path fileType="man">/usr/share/man/man8/cupsreject.8</Path>
+ <Path fileType="man">/usr/share/man/man8/lpadmin.8</Path>
+ <Path fileType="man">/usr/share/man/man8/lpc.8</Path>
+ <Path fileType="man">/usr/share/man/man8/lpinfo.8</Path>
+ <Path fileType="man">/usr/share/man/man8/lpmove.8</Path>
</Files>
</Package>
<Package>
@@ -829,14 +826,11 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="24">cups</Dependency>
+ <Dependency release="25">cups</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libcups.so.2</Path>
- <Path fileType="library">/usr/lib32/libcupscgi.so.1</Path>
<Path fileType="library">/usr/lib32/libcupsimage.so.2</Path>
- <Path fileType="library">/usr/lib32/libcupsmime.so.1</Path>
- <Path fileType="library">/usr/lib32/libcupsppdc.so.1</Path>
</Files>
</Package>
<Package>
@@ -846,15 +840,12 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="24">cups-devel</Dependency>
- <Dependency release="24">cups-32bit</Dependency>
+ <Dependency release="25">cups-devel</Dependency>
+ <Dependency release="25">cups-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libcups.so</Path>
- <Path fileType="library">/usr/lib32/libcupscgi.so</Path>
<Path fileType="library">/usr/lib32/libcupsimage.so</Path>
- <Path fileType="library">/usr/lib32/libcupsmime.so</Path>
- <Path fileType="library">/usr/lib32/libcupsppdc.so</Path>
</Files>
</Package>
<Package>
@@ -864,7 +855,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="24">cups</Dependency>
+ <Dependency release="25">cups</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/cups-config</Path>
@@ -884,20 +875,17 @@
<Path fileType="header">/usr/include/cups/transcode.h</Path>
<Path fileType="header">/usr/include/cups/versioning.h</Path>
<Path fileType="library">/usr/lib64/libcups.so</Path>
- <Path fileType="library">/usr/lib64/libcupscgi.so</Path>
<Path fileType="library">/usr/lib64/libcupsimage.so</Path>
- <Path fileType="library">/usr/lib64/libcupsmime.so</Path>
- <Path fileType="library">/usr/lib64/libcupsppdc.so</Path>
- <Path fileType="man">/usr/share/man/man1/cups-config.1.gz</Path>
+ <Path fileType="man">/usr/share/man/man1/cups-config.1</Path>
</Files>
</Package>
<History>
- <Update release="24">
- <Date>2019-09-09</Date>
- <Version>2.2.8</Version>
+ <Update release="25">
+ <Date>2020-01-04</Date>
+ <Version>2.3.1</Version>
<Comment>Packaging update</Comment>
- <Name>Pierre-Yves</Name>
- <Email>pyu@riseup.net</Email>
+ <Name>Fernando Monteiro</Name>
+ <Email>fr02monteiro@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 5:06 PM (2 h, 52 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5814601
Default Alt Text
D7990.id19095.diff (85 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.