cups: Fixes Bug#12924 - Can't access https pages in cups

- Version 2.4.2 had some bugs that caused the self signed certificates to not be read or
   created properly. The two involved bug fix patches are applied in this submission.
- Corrected the configure options related to avahi and TLS. Using Openssl for the TLS.
- Built .ipfire package installed into vm testbed and tested. With existing 2.4.2
   any https pages come up with an error for the secure connection. With this version
   the https admin page opens up and config file was able to be successfully modified
   via it.

Fixes: Bug#12924
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

lfs/cups

@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 33
+PAK_VER    = 34
 
 DEPS       = avahi cups-filters dbus ghostscript
 
@@ -80,6 +80,8 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cups-2.4.2_Fix_default_cupsd_keychain_with_OpenSSL.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cups-2.4.2_Fix_TLS_certificate_generation_bugs_with_openssl.patch
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && \
 		./configure \
@@ -87,9 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--sysconfdir=/var/ipfire \
 			--localstatedir=/var \
 			--enable-debug \
-			--enable-avahi \
+			--with-dnssd=avahi \
 			--enable-dbus \
-			--enable-gnutls \
+			--with-tls=openssl \
 			--enable-libusb
 
 	cd $(DIR_APP) && make $(MAKETUNING)