]>
git.ipfire.org Git - thirdparty/cups-filters.git/log
Till Kamppeter [Tue, 1 Sep 2020 12:02:44 +0000 (14:02 +0200)]
Updated NEWS
(cherry picked from commit
1a06dead1f692ae3f8276df60da0e505143d82ac )
Samuel Thibault [Mon, 31 Aug 2020 19:26:13 +0000 (21:26 +0200)]
braille: Support new liblouis tables not containing a display name
(cherry picked from commit
e29392b4e10358a7268a8704ba1e78e67c895dac )
Till Kamppeter [Sat, 29 Aug 2020 07:17:31 +0000 (09:17 +0200)]
Build system: Let ./configure not error out on more than one test font candidate
(cherry picked from commit
e50fb6ca04be3b8a472e575b349837a2dc22042f )
Till Kamppeter [Fri, 28 Aug 2020 21:59:49 +0000 (23:59 +0200)]
Fixed NEWS
Till Kamppeter [Fri, 28 Aug 2020 21:57:44 +0000 (23:57 +0200)]
cups-browsed: Fixed printf() call to prevent crash
(cherry picked from commit
d2aed0ae5f94cfa2f7d54a5244951d965498f1e1 )
Till Kamppeter [Thu, 27 Aug 2020 13:56:27 +0000 (15:56 +0200)]
Updated NEWS
Till Kamppeter [Thu, 27 Aug 2020 13:45:22 +0000 (15:45 +0200)]
libcupsfilters: Removed all signal handling and global variables from get_printer_attributes() and ippfind_based_uri_converter()
(cherry picked from commit
23a9dc4010cefe239b8393e4500eb834b0f5ee32 )
Till Kamppeter [Wed, 26 Aug 2020 22:01:49 +0000 (00:01 +0200)]
cups-filters 1.28.1 Release
Till Kamppeter [Wed, 26 Aug 2020 21:46:44 +0000 (23:46 +0200)]
driverless-fax: The script is now generated from driverless-fax.in, do not add it to the source tarball
(cherry picked from commit
b17c184806c8aa367a4ef0f88eba7321faee11c1 )
Till Kamppeter [Wed, 26 Aug 2020 21:36:39 +0000 (23:36 +0200)]
Updated NEWS.
Till Kamppeter [Wed, 26 Aug 2020 21:00:00 +0000 (23:00 +0200)]
Updated NEWS
(cherry picked from commit
1a9fee1ec9df1de25db86fba70d100014f8e54a6 )
Till Kamppeter [Wed, 26 Aug 2020 20:46:57 +0000 (22:46 +0200)]
COPYING: Fixed typos
(cherry picked from commit
91958bb3a5c7dca7d33b1ffe5f2727d8f39e08f6 )
Till Kamppeter [Wed, 26 Aug 2020 20:41:15 +0000 (22:41 +0200)]
libcupsfilters: Fixed typo in log message
(cherry picked from commit
4cc27df80d5a4f16992259dab04e6e5d7639b96d )
Till Kamppeter [Wed, 26 Aug 2020 20:39:53 +0000 (22:39 +0200)]
cups-browsed: Fixed typos in configuration file and man page
(cherry picked from commit
2c220e979890901bec95aff8875f477d8bbc4916 )
Till Kamppeter [Wed, 26 Aug 2020 19:03:28 +0000 (21:03 +0200)]
libcupsfilters: In generated PPDs do not use ".Borderless" suffixes if printer has always zero margins
(cherry picked from commit
d28d4a8218e40909ac33b17f9aba44b3bbc1f1ee )
Till Kamppeter [Wed, 26 Aug 2020 17:45:38 +0000 (19:45 +0200)]
libcupsfilters: Added "faxPrefix" option for generated IPP Fax Out PPDs
(cherry picked from commit
553c941353010ead33acb0ffc43e5367f268f9af )
Till Kamppeter [Wed, 26 Aug 2020 16:55:54 +0000 (18:55 +0200)]
driverless: List local services addresses correctly when using --std-ipp-uris
(cherry picked from commit
bd69dedfa5b0ad7185f783b7d88bb540ad69ce50 )
Till Kamppeter [Wed, 26 Aug 2020 16:43:08 +0000 (18:43 +0200)]
driverless: Make calls of ippfind somewhat faster
(cherry picked from commit
7ec4023788663849755985ae5bcae687156c0a84 )
Till Kamppeter [Wed, 26 Aug 2020 16:17:18 +0000 (18:17 +0200)]
libcupsfilters: Resolve DNS-SD-based URIs for local services correctly
(cherry picked from commit
8dd6a38e64396d60fdfb3e08edd095c1bfae185e )
Till Kamppeter [Wed, 26 Aug 2020 15:17:01 +0000 (17:17 +0200)]
libcupsfilters: in get_printer_attributes() functions do not convert URIs which are not DNS-SD-based, support dnssd://... URI scheme
(cherry picked from commit
9ef04c9bddb71b6b426bb5fe89df9a36bbee459e )
Till Kamppeter [Wed, 26 Aug 2020 12:47:52 +0000 (14:47 +0200)]
libcupsfilters: Code clean-up of ippfind_based_uri_converter() function
(cherry picked from commit
7c834bc00c57370d0fd1eadf94c3c2a8a5c9ebbb )
Till Kamppeter [Wed, 26 Aug 2020 12:15:07 +0000 (14:15 +0200)]
libcupsfilters: Moved signal handling back into main function of get_printer_attributes() variants
(cherry picked from commit
ee8ef028c0fae4b570594166d00ce866fa69f864 )
Till Kamppeter [Wed, 26 Aug 2020 12:01:54 +0000 (14:01 +0200)]
driverless: For generating a PPD, always allow CUPS driver URIs and pure IPP URIs
(cherry picked from commit
0452676c8cacab21565f1fb202973d86da6756f4 )
Zdenek Dohnal [Wed, 26 Aug 2020 11:23:05 +0000 (13:23 +0200)]
driverless.c: accept clean ipp uris too for 'driverless cat'
(cherry picked from commit
8c24dfca8050c5b94e2aa1576e41e360581ce8e3 )
Till Kamppeter [Wed, 26 Aug 2020 06:45:52 +0000 (08:45 +0200)]
Updated NEWS
Zdenek Dohnal [Wed, 26 Aug 2020 06:37:36 +0000 (08:37 +0200)]
driverless-fax: don't use a fixed path
(cherry picked from commit
324a91f663be483c8efecae9e641f0e45382c4fc )
Till Kamppeter [Tue, 25 Aug 2020 16:49:32 +0000 (18:49 +0200)]
cups-filters 1.28.0 Release
Till Kamppeter [Tue, 25 Aug 2020 14:54:55 +0000 (16:54 +0200)]
Updated NEWS
(cherry picked from commit
d3fc26073c0a35555362769595e6188fc167324d )
Till Kamppeter [Tue, 25 Aug 2020 14:36:40 +0000 (16:36 +0200)]
driverless: Add "Fax" to the driver name not to model name, as printer anf fax have same URI
(cherry picked from commit
fb8e85e7b8ee8f18e4a29eaddd2aab1130779cc9 )
Till Kamppeter [Tue, 25 Aug 2020 14:09:00 +0000 (16:09 +0200)]
driverless: Avoid duplicate entries form IPP/IPPS in "list" output
(cherry picked from commit
f6cd8592e2cf7f1d13b0f6cfe543ce63121cfd37 )
Till Kamppeter [Tue, 25 Aug 2020 13:03:09 +0000 (15:03 +0200)]
driverless: Remove spaces from CMD field of artificial device ID
(cherry picked from commit
53f558408082b17c4e2454bb1fa364a4454482a2 )
Till Kamppeter [Tue, 25 Aug 2020 12:57:28 +0000 (14:57 +0200)]
driverless, libcupsfilters: Add "Fax" to printer model name when we work with the Fax part of it
(cherry picked from commit
c84e4295442d682613de175818e958e671f6c14a )
Till Kamppeter [Tue, 25 Aug 2020 11:53:16 +0000 (13:53 +0200)]
libfontembed: Silenced warning with gcc 10.x
(cherry picked from commit
5e1aa85f5316a10ff195aa4eb0272073040fc19d )
Till Kamppeter [Mon, 24 Aug 2020 22:15:50 +0000 (00:15 +0200)]
driverless: White space and indentation clean-up
(cherry picked from commit
c343f1bb8e38cb1921ab85524d3a343ca6a4be55 )
Till Kamppeter [Mon, 24 Aug 2020 21:06:16 +0000 (23:06 +0200)]
driverless-fax: Clean-up of wrapper script
(cherry picked from commit
80bea829a4aa3ce67258c6ba5d399eef1eb31b39 )
nidhijainpnp [Wed, 19 Aug 2020 17:17:27 +0000 (22:47 +0530)]
added enum type to switch function
(cherry picked from commit
92c6403b8b1c67c622218c6b199a9667afeeb799 )
nidhijainpnp [Tue, 18 Aug 2020 10:02:28 +0000 (15:32 +0530)]
ipp.h,ipp.c: add is_fax argument in ippfind_based_uri_converter() function
(cherry picked from commit
3446ff68201d64be67cc0ed4c38e8ded1dbb1090 )
nidhijainpnp [Mon, 17 Aug 2020 15:24:23 +0000 (20:54 +0530)]
ipp.h, ipp.c, driverless.c: added get_printer_attributes4() ,get_printer_attributes5() ,ippfind_based_uri_converter() function
(cherry picked from commit
cd8b621e799f86ece62cc24035fafab6b78f5837 )
nidhijainpnp [Sun, 16 Aug 2020 15:19:53 +0000 (20:49 +0530)]
makefile: add driverless-fax
(cherry picked from commit
b8e03ba5b8ac22415d4bb453de409a971c3486a7 )
nidhijainpnp [Sun, 16 Aug 2020 15:19:22 +0000 (20:49 +0530)]
ipp.c:replace cupsBackendDeviceURi()
(cherry picked from commit
88c68887e8b96ca1a1ab68c5fb45568ad865201b )
nidhijainpnp [Sun, 16 Aug 2020 15:17:53 +0000 (20:47 +0530)]
driverless-fax:wrapper script for fax-support
(cherry picked from commit
640e10f1dec304bf3f6c6f7ca035fc939cbee53b )
nidhijainpnp [Sun, 16 Aug 2020 15:17:15 +0000 (20:47 +0530)]
driverless.c:add fax-support
(cherry picked from commit
d2963934332b5f57631ff4409a3b53adf976731a )
Till Kamppeter [Tue, 25 Aug 2020 15:10:23 +0000 (17:10 +0200)]
Revert "driverless-fax: Clean-up of wrapper script"
This reverts commit
9f8e09b0a183d4652717b0ea8e8df34d8fd2d6a4 .
Till Kamppeter [Mon, 24 Aug 2020 21:06:16 +0000 (23:06 +0200)]
driverless-fax: Clean-up of wrapper script
(cherry picked from commit
80bea829a4aa3ce67258c6ba5d399eef1eb31b39 )
nidhijainpnp [Mon, 24 Aug 2020 19:10:34 +0000 (00:40 +0530)]
ppdgenerator.c: fix phone option for faxout
(cherry picked from commit
28d3b7b8eb759b6f254f2da23f001750316b0c9d )
nidhijainpnp [Mon, 24 Aug 2020 16:36:49 +0000 (22:06 +0530)]
ppdgenerator.c: add fax support
(cherry picked from commit
722bf020afbec2041ade4923c2c5564176027884 )
Till Kamppeter [Fri, 21 Aug 2020 09:21:28 +0000 (11:21 +0200)]
Updated NEWS
(cherry picked from commit
4ce870e67442399d2f153fc854c91c4e8f6fbd4a )
Zdenek Dohnal [Fri, 21 Aug 2020 08:33:21 +0000 (10:33 +0200)]
configure.ac: Add configure option for keeping created queues during shutdown
(cherry picked from commit
5f913cc7e3ccb999afa75d4f655056128e6bb87e )
Zdenek Dohnal [Fri, 21 Aug 2020 07:54:38 +0000 (09:54 +0200)]
configure.ac: Add configure option for local queues naming for remote CUPS queues
(cherry picked from commit
1368e2541832143db212a18e2b0144d303976406 )
Till Kamppeter [Thu, 20 Aug 2020 21:44:05 +0000 (23:44 +0200)]
cups-browsed: Silenced warning of GCC 10.2.0.
(cherry picked from commit
8b48841b5b703d304edac7e6b017bd01f9fa386f )
Till Kamppeter [Wed, 19 Aug 2020 09:52:25 +0000 (11:52 +0200)]
Updated NEWS
(cherry picked from commit
65b13ead433b69df30ecd48fdea62dc2ba1955bc )
Zdenek Dohnal [Wed, 19 Aug 2020 09:42:42 +0000 (11:42 +0200)]
cups-browsed.c: fix compiler warnings
(cherry picked from commit
8ffcfe9e859fbb29b97db18dc956dfa8e0687b5f )
Till Kamppeter [Wed, 19 Aug 2020 08:03:21 +0000 (10:03 +0200)]
Updated NEWS
(cherry picked from commit
6584b4740345469451913ecc6830d953ea00dc89 )
Zdenek Dohnal [Tue, 18 Aug 2020 06:01:08 +0000 (08:01 +0200)]
cups-browsed.c: Fix several memory leaks
(cherry picked from commit
ee288bfdf0b6f3778d3962087ae8d5fb1890215a )
Till Kamppeter [Mon, 10 Aug 2020 08:19:00 +0000 (10:19 +0200)]
Updated NEWS
(cherry picked from commit
dadad395fac5347996c362e1aeded35a25bc977e )
Till Kamppeter [Mon, 10 Aug 2020 08:14:42 +0000 (10:14 +0200)]
driverless: Correct line wrapping in help output
(cherry picked from commit
ab170fd82b41db57ec0f9ee87e3e5abe96b04c27 )
nidhijainpnp [Mon, 10 Aug 2020 07:46:39 +0000 (13:16 +0530)]
call with --std-ipp-uris command line option to show uris in standard form
(cherry picked from commit
073d94d4169f31870303ede90738fd69bcfbadf7 )
nidhijainpnp [Mon, 10 Aug 2020 05:58:33 +0000 (11:28 +0530)]
Added command line option to show uris in standard form
(cherry picked from commit
b00174428ede2ff4027b9cc06067ad96c83efe0e )
Till Kamppeter [Sun, 9 Aug 2020 22:17:50 +0000 (00:17 +0200)]
Updated NEWS
(cherry picked from commit
310523a479e2cd00b6af3a58833c13c4cc0b93d5 )
rishabharya [Sun, 9 Aug 2020 22:06:21 +0000 (03:36 +0530)]
Resolving texttopdf filter crashing issue due to assert calls
(cherry picked from commit
03843b959ed693c5580d2fa39247608b9e6c02f4 )
Till Kamppeter [Sat, 8 Aug 2020 17:53:14 +0000 (19:53 +0200)]
Updated NEWS
(cherry picked from commit
53dfe5320582821eaa81700c7c291096075e287c )
nidhijainpnp [Sat, 8 Aug 2020 17:25:25 +0000 (22:55 +0530)]
update code for mode=2
(cherry picked from commit
4414c28108a67cff1ea50e454264de86da30e9e8 )
Jai Luthra [Sat, 8 Aug 2020 15:22:49 +0000 (20:52 +0530)]
libcupsfilters: Silence warning due to redefinition.
(cherry picked from commit
41be5c271b71c31af38a3247d80b095d127a0c86 )
nidhijainpnp [Sat, 8 Aug 2020 13:19:35 +0000 (18:49 +0530)]
Updating driverless
(cherry picked from commit
c92a76f479f35950a6115e8e933438c7361c9191 )
nidhijainpnp [Thu, 6 Aug 2020 04:57:23 +0000 (10:27 +0530)]
minor documentation correction in driverless
(cherry picked from commit
61365c026e27b0bf534f14e20f20853aca9d3e54 )
nidhijainpnp [Wed, 5 Aug 2020 19:15:55 +0000 (00:45 +0530)]
modify driverless to list ipp and ipps printers
(cherry picked from commit
9bc646c7b7aa2229464efa05b6f7148a285d0c50 )
Till Kamppeter [Tue, 4 Aug 2020 21:52:49 +0000 (23:52 +0200)]
gstoraster, gstopdf: Use "-dPDFSETTINGS=/default" for PDF output
(cherry picked from commit
91aaae14e49ba95a8ad6cba0530bdb68f3f1c8e6 )
nidhijainpnp [Sun, 2 Aug 2020 14:19:48 +0000 (19:49 +0530)]
changes in driverless.c file to list ippand ipps printers
(cherry picked from commit
fc7c0ab9e3ef4faa0b7baf6281ae5e457b608e04 )
nidhijainpnp [Wed, 29 Jul 2020 05:48:12 +0000 (11:18 +0530)]
changes in driverless.c file to list IPPS printers
(cherry picked from commit
d3384bb12278cbdf845540bf744268244d895c32 )
Till Kamppeter [Sun, 26 Jul 2020 21:10:53 +0000 (23:10 +0200)]
Updated NEWS
(cherry picked from commit
1ede179c81db91fa1fef0eb517f9b2ce4bde3e82 )
Dipanshu [Thu, 23 Jul 2020 19:43:16 +0000 (01:13 +0530)]
minor documentation errors resolved
(cherry picked from commit
4555c7116c667c3817669020085c605271cca82b )
Dipanshu [Thu, 23 Jul 2020 15:58:48 +0000 (21:28 +0530)]
added function to turn off configuration
(cherry picked from commit
f51a3c9efd3d85cca0f374a2ba40079af6d4aac4 )
Dipanshu [Thu, 23 Jul 2020 13:09:11 +0000 (18:39 +0530)]
file copying now uses a 2KB buffer
(cherry picked from commit
4abffecbf853619ab9403badf2b7eb0bc32e406f )
Dipanshu [Thu, 23 Jul 2020 12:08:42 +0000 (17:38 +0530)]
made DebugLogFileSize configurable
(cherry picked from commit
d8e30a81bac7bcdfc8d1399bf204328d36ae866e )
Dipanshu [Wed, 22 Jul 2020 15:27:36 +0000 (20:57 +0530)]
changes in cups-browsed.c file to produce back-up file
(cherry picked from commit
b49dcbbade60edf814dca126bcc9ff388153b9c1 )
Till Kamppeter [Mon, 20 Jul 2020 09:19:54 +0000 (11:19 +0200)]
gstoraster, gstopdf: Do not apply margis when output format is PDF
(cherry picked from commit
e4f0f09e2ad224bf8df2a691b1646a8fc4f37baf )
Till Kamppeter [Wed, 15 Jul 2020 16:57:47 +0000 (18:57 +0200)]
cups-browsed: Do not write any log messages directly to stderr
(cherry picked from commit
aa19fa3f21d9f00150e188c3cb84b39965c23367 )
Till Kamppeter [Tue, 14 Jul 2020 11:04:06 +0000 (13:04 +0200)]
Updated NEWS
(cherry picked from commit
2874b4b6d53a73964dd7b0b9d250acc02496deca )
Fabrice Fontaine [Mon, 13 Jul 2020 21:02:50 +0000 (23:02 +0200)]
configure.ac: fix cross-compilation without dejavu
Cross-compilation is broken since commit
1d66106 . Indeed, when
cross-compiling, dejavu font won't be installed in /usr/share/fonts. The
path (e.g. $(TARGET_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf) could be
provided through --with-test-font-path which will fix the build failure
but will result in broken test programs.
So when cross-compiling don't try to check if the test-font-path is
valid or not and just use the one provided by the user or the default
one (e.g. /usr/share/fonts/dejavu/DejaVuSans.ttf)
Fix #262
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
(cherry picked from commit
6ad1ed8b7939bf75079b0a770e234bfee7d33dbb )
Till Kamppeter [Mon, 13 Jul 2020 11:50:00 +0000 (13:50 +0200)]
Updated NEWS
(cherry picked from commit
dde2c61f5b8942fe73900f55af8590d9b43b313d )
Till Kamppeter [Mon, 13 Jul 2020 11:49:12 +0000 (13:49 +0200)]
libcupsfilters: "True" is case-sensitive in PPDs
(cherry picked from commit
42868e742bf8db35ed95cdab48fc4c7d6b277c4e )
Till Kamppeter [Wed, 8 Jul 2020 08:08:03 +0000 (10:08 +0200)]
Correction in NEWS
(cherry picked from commit
7558f91530d9cdfd9985623bc5e0ffe386d7545e )
Till Kamppeter [Mon, 6 Jul 2020 11:27:25 +0000 (13:27 +0200)]
Correction in NEWS
(cherry picked from commit
d9921b8f04acb809349764400e21ff36f4679d1c )
Till Kamppeter [Thu, 20 Aug 2020 19:52:24 +0000 (21:52 +0200)]
Corrected NEWS
liuli0217 [Thu, 2 Jul 2020 09:42:13 +0000 (17:42 +0800)]
fix: get inheritable attribute from parent
when /mediabox is inherited from parent, can't get rect.
(cherry picked from commit
bee967b99ab8261c928580c4f78150863627a242 )
Till Kamppeter [Wed, 1 Jul 2020 11:41:17 +0000 (13:41 +0200)]
libcupsfilters: Work around fold-accordion typo in libcups < 2.3.1
(cherry picked from commit
8ba3d5b5c9c801e81a37c0402da8754bc3d8ce63 )
Till Kamppeter [Tue, 30 Jun 2020 09:26:42 +0000 (11:26 +0200)]
cups-browsed: Remove left-over local queues more quickly
(cherry picked from commit
de3420ca8b6e3d4b165606bf02d6f298f9cdccb2 )
Till Kamppeter [Tue, 30 Jun 2020 09:20:30 +0000 (11:20 +0200)]
cups-browsed: Left-over local queues from the previous session did not get removed
(cherry picked from commit
f5ec64ac6747a7757671f3940307aeb87fbc44f7 )
Till Kamppeter [Sun, 28 Jun 2020 21:59:14 +0000 (23:59 +0200)]
Updated NEWS
(cherry picked from commit
7b92065799fefb64476bb764ec032358903d2c7b )
Till Kamppeter [Fri, 26 Jun 2020 19:53:44 +0000 (21:53 +0200)]
gstoraster, gstopdf: Make number of copies as embedded PostScript command work
(cherry picked from commit
6157b8f6178b89fa7a040c2057ff91eb9ac8885d )
Till Kamppeter [Fri, 26 Jun 2020 19:44:41 +0000 (21:44 +0200)]
Updated NEWS
(cherry picked from commit
41e38f4f0f41a182f1395190ccd050bf81fb3db5 )
DuratarskeyK [Fri, 26 Jun 2020 12:11:38 +0000 (15:11 +0300)]
Potential null dereference fix (#1)
Fix a potential NULL dereference, when PPD file isn't present or can't be openned
(cherry picked from commit
c30dcf007ccbfe1edb21e3b1227d482a762a8a35 )
Till Kamppeter [Sun, 21 Jun 2020 18:29:23 +0000 (20:29 +0200)]
Updated NEWS
(cherry picked from commit
a173421599accc0f827ff41d8421710627a9e204 )
Till Kamppeter [Sat, 20 Jun 2020 12:17:26 +0000 (14:17 +0200)]
cups-browsed: Call cupsGetNamedDest() only if "OnlyUnsupportedByCUPS No"
(cherry picked from commit
ce3dd0fb0feb84de039d4729eaad170ee639d258 )
Till Kamppeter [Sat, 20 Jun 2020 12:10:58 +0000 (14:10 +0200)]
Ordissimo [Fri, 19 Jun 2020 08:58:57 +0000 (10:58 +0200)]
Correction default color
Correction of the default value of the color, after configuration of the CANON in IPP the test page is printed in black and white. The test empties the cartridges!
A more logical choice is Color.
Reproduced with CANON TS3150, TS3350, TS5150
(cherry picked from commit
715fcf8f6aea6396069581c7d5ebd0f5d6c63279 )
Zdenek Dohnal [Fri, 19 Jun 2020 07:06:57 +0000 (09:06 +0200)]
Mark the temp queue as cups-browsed during setting printer-is-shared
(cherry picked from commit
71928b7de1204ca34334164e81da46a9fd527da3 )
mohitmo [Wed, 17 Jun 2020 07:41:36 +0000 (13:11 +0530)]
delete response only when not NULL
(cherry picked from commit
033e29caf3862206a1ff7516c906760dff82d574 )
mohitmo [Wed, 17 Jun 2020 07:28:42 +0000 (12:58 +0530)]
set dest to NULL
(cherry picked from commit
0e658c1fdac46253c24d44a45b0ecdb55ebee617 )
mohitmo [Wed, 17 Jun 2020 05:57:16 +0000 (11:27 +0530)]
modified when to call cupsGetNamedDest()
(cherry picked from commit
d17f2f94069ca684f8fae325603f51314cdcec44 )