cups: fix packaging issues

* No /sbin directories - Termux does not add it to PATH.
* No commas in CONFFILES definition - that's acutally a file path list.
* No hardcoded LDFLAGS - must be in sync with LDFLAGS defined by build-package.sh.
* Remove redundant license file definition - determined automatically.

packages/cups/build.sh

@@ -1,16 +1,19 @@
 TERMUX_PKG_HOMEPAGE="https://www.cups.org/"
 TERMUX_PKG_DESCRIPTION="Common UNIX Printing System"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_LICENSE_FILE="LICENSE"
 TERMUX_PKG_VERSION="2.3.3"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/apple/cups/releases/download/v${TERMUX_PKG_VERSION}/cups-${TERMUX_PKG_VERSION}-source.tar.gz"
 TERMUX_PKG_SHA256="261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee"
 TERMUX_PKG_DEPENDS="libiconv, libcrypt"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_CONFFILES="etc/cups/cups-files.conf, etc/cups/cupsd.conf, etc/cups/snmp.conf"
+
+TERMUX_PKG_CONFFILES="
+etc/cups/cups-files.conf
+etc/cups/cupsd.conf
+etc/cups/snmp.conf
+"
 
 termux_step_make() {
-	cd "$TERMUX_PKG_BUILDDIR"
-	make LIBS="-pthread -lm -lcrypt -liconv -lz -L$TERMUX_PREFIX/lib -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,--hash-style=both" -j${TERMUX_MAKE_PROCESSES}
+	make LIBS="-pthread $LDFLAGS -Wl,--hash-style=both -lm -lcrypt -liconv -lz" -j${TERMUX_MAKE_PROCESSES}
 }
-

packages/cups/no-sbindir.patch

@@ -0,0 +1,80 @@
+diff -uNr cups-2.3.3/config-scripts/cups-directories.m4 cups-2.3.3.mod/config-scripts/cups-directories.m4
+--- cups-2.3.3/config-scripts/cups-directories.m4	2020-04-27 21:04:29.000000000 +0300
++++ cups-2.3.3.mod/config-scripts/cups-directories.m4	2020-07-24 16:44:23.353948751 +0300
+@@ -31,9 +31,7 @@
+ AC_DEFINE_UNQUOTED(CUPS_BINDIR, "$bindir")
+ 
+ dnl Fix "sbindir" variable...
+-if test "$sbindir" = "\${exec_prefix}/sbin"; then
+-	sbindir="$exec_prefix/sbin"
+-fi
++sbindir="$exec_prefix/bin"
+ 
+ AC_DEFINE_UNQUOTED(CUPS_SBINDIR, "$sbindir")
+ 
+diff -uNr cups-2.3.3/Makedefs.in cups-2.3.3.mod/Makedefs.in
+--- cups-2.3.3/Makedefs.in	2020-04-27 21:04:29.000000000 +0300
++++ cups-2.3.3.mod/Makedefs.in	2020-07-24 16:43:17.017576910 +0300
+@@ -214,7 +214,7 @@
+ oldincludedir	=	@oldincludedir@
+ prefix		=	@prefix@
+ privateinclude	=	@privateinclude@
+-sbindir		=	@sbindir@
++sbindir		=	@bindir@
+ sharedstatedir	=	@sharedstatedir@
+ srcdir		=	@srcdir@
+ sysconfdir	=	@sysconfdir@
+@@ -240,7 +240,7 @@
+ RCSTOP		=	@RCSTOP@
+ REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
+ RESOURCEDIR	=	@CUPS_RESOURCEDIR@
+-SBINDIR		=	$(BUILDROOT)@sbindir@
++SBINDIR		=	$(BUILDROOT)@bindir@
+ SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
+ SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
+ STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
+diff -uNr cups-2.3.3/packaging/cups.list.in cups-2.3.3.mod/packaging/cups.list.in
+--- cups-2.3.3/packaging/cups.list.in	2020-04-27 21:04:29.000000000 +0300
++++ cups-2.3.3.mod/packaging/cups.list.in	2020-07-24 16:44:35.554017021 +0300
+@@ -187,7 +187,7 @@
+ $localstatedir=@localstatedir@
+ $mandir=@mandir@
+ $oldincludedir=@oldincludedir@
+-$sbindir=@sbindir@
++$sbindir=@bindir@
+ $sharedstatedir=@sharedstatedir@
+ $srcdir=@srcdir@
+ $sysconfdir=@sysconfdir@
+@@ -212,7 +212,7 @@
+ $PAMDIR=@PAMDIR@
+ $PMANDIR=@PMANDIR@
+ $REQUESTS=@CUPS_REQUESTS@
+-$SBINDIR=@sbindir@
++$SBINDIR=@bindir@
+ $SERVERBIN=@CUPS_SERVERBIN@
+ $SERVERROOT=@CUPS_SERVERROOT@
+ $STATEDIR=@CUPS_STATEDIR@
+diff -uNr cups-2.3.3/scheduler/cups.sh.in cups-2.3.3.mod/scheduler/cups.sh.in
+--- cups-2.3.3/scheduler/cups.sh.in	2020-04-27 21:04:29.000000000 +0300
++++ cups-2.3.3.mod/scheduler/cups.sh.in	2020-07-24 16:43:34.525675148 +0300
+@@ -153,7 +153,7 @@
+ 			else
+ 				prefix=@prefix@
+ 				exec_prefix=@exec_prefix@
+-				@sbindir@/cupsd
++				@bindir@/cupsd
+ 				if test $? != 0; then
+ 					$ECHO_FAIL
+ 					$ECHO "cups: unable to $1 scheduler."
+diff -uNr cups-2.3.3/scheduler/cups.xml.in cups-2.3.3.mod/scheduler/cups.xml.in
+--- cups-2.3.3/scheduler/cups.xml.in	2020-04-27 21:04:29.000000000 +0300
++++ cups-2.3.3.mod/scheduler/cups.xml.in	2020-07-24 16:43:26.021627443 +0300
+@@ -77,7 +77,7 @@
+         <exec_method
+             type='method'
+             name='start'
+-            exec='@sbindir@/cupsd'
++            exec='@bindir@/cupsd'
+             timeout_seconds='60' >
+             <method_context>
+                 <method_credential user='root' group='@CUPS_GROUP@' />