Bump version to 2.4.13.

Drop macOS language bundle support since they don't match CUPS 2.4.x
strings.

Author: michaelrsweet

Makedefs.in

@@ -1,7 +1,7 @@
 #
 # Common makefile definitions for CUPS.
 #
-# Copyright © 2020-2024 by OpenPrinting.
+# Copyright © 2020-2025 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -77,8 +77,6 @@ CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
 #
 
 LANGUAGES	=	@LANGUAGES@
-INSTALL_LANGUAGES =	@INSTALL_LANGUAGES@
-UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@
 
 #
 # Cross-compilation support: "local" target is used for any tools that are
@@ -223,7 +221,6 @@ top_srcdir	=	@top_srcdir@
 BUILDROOT	=	$(DSTROOT)$(DESTDIR)
 
 BINDIR		=	$(BUILDROOT)@bindir@
-BUNDLEDIR	=	@CUPS_BUNDLEDIR@
 CACHEDIR	=	$(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
 DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
@@ -239,7 +236,6 @@ RCLEVELS	=	@RCLEVELS@
 RCSTART		=	@RCSTART@
 RCSTOP		=	@RCSTOP@
 REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
-RESOURCEDIR	=	@CUPS_RESOURCEDIR@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@

config-scripts/cups-defaults.m4

@@ -1,7 +1,7 @@
 dnl
 dnl Default cupsd configuration settings for CUPS.
 dnl
-dnl Copyright © 2020-2024 by OpenPrinting.
+dnl Copyright © 2020-2025 by OpenPrinting.
 dnl Copyright © 2007-2018 by Apple Inc.
 dnl Copyright © 2006-2007 by Easy Software Products, all rights reserved.
 dnl
@@ -25,40 +25,6 @@ AC_ARG_WITH([languages], AS_HELP_STRING([--with-languages], [set installed langu
 ])
 AC_SUBST([LANGUAGES])
 
-dnl macOS bundle-based localization support
-AC_ARG_WITH([bundledir], AS_HELP_STRING([--with-bundledir], [set localization bundle directory]), [
-    CUPS_BUNDLEDIR="$withval"
-], [
-    AS_IF([test "x$host_os_name" = xdarwin -a $host_os_version -ge 100], [
-        CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
-	LANGUAGES=""
-    ], [
-	CUPS_BUNDLEDIR=""
-    ])
-])
-
-AC_SUBST([CUPS_BUNDLEDIR])
-AS_IF([test "x$CUPS_BUNDLEDIR" != x], [
-    AC_DEFINE_UNQUOTED([CUPS_BUNDLEDIR], ["$CUPS_BUNDLEDIR"], [macOS bundle directory.])
-])
-
-AC_ARG_WITH([bundlelang], AS_HELP_STRING([--with-bundlelang], [set localization bundle base language (English or en)]), [
-    cups_bundlelang="$withval"
-], [
-    AS_IF([test $host_os_version -ge 190], [
-	cups_bundlelang="en"
-    ], [
-	cups_bundlelang="English"
-    ])
-])
-
-AS_IF([test "x$cups_bundlelang" != x -a "x$CUPS_BUNDLEDIR" != x], [
-    CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/$cups_bundlelang.lproj"
-], [
-    CUPS_RESOURCEDIR=""
-])
-AC_SUBST([CUPS_RESOURCEDIR])
-
 dnl Default executable file permissions
 AC_ARG_WITH([exe_file_perm], AS_HELP_STRING([--with-exe-file-perm], [set default executable permissions value, default=0755]), [
     CUPS_EXE_FILE_PERM="$withval"

config.h.in

@@ -659,13 +659,6 @@
 #undef HAVE_SYS_VFS_H
 
 
-/*
- * Location of macOS localization bundle, if any.
- */
-
-#undef CUPS_BUNDLEDIR
-
-
 /*
  * Do we have XPC?
  */

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for CUPS 2.4.12.
+# Generated by GNU Autoconf 2.71 for CUPS 2.4.13.
 #
 # Report bugs to <https://github.com/openprinting/cups/issues>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.4.12'
-PACKAGE_STRING='CUPS 2.4.12'
+PACKAGE_VERSION='2.4.13'
+PACKAGE_STRING='CUPS 2.4.13'
 PACKAGE_BUGREPORT='https://github.com/openprinting/cups/issues'
 PACKAGE_URL='https://openprinting.github.io/cups'
 
@@ -650,8 +650,6 @@ ac_header_c_list=
 ac_default_prefix=/
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-UNINSTALL_LANGUAGES
-INSTALL_LANGUAGES
 TIMEOUTSTARTSEC
 EXIT_TIMEOUT
 SYSTEMD_WANTED_BY
@@ -680,8 +678,6 @@ CUPS_LOG_FILE_PERM
 CUPS_CUPSD_FILE_PERM
 CUPS_CONFIG_FILE_PERM
 CUPS_EXE_FILE_PERM
-CUPS_RESOURCEDIR
-CUPS_BUNDLEDIR
 LANGUAGES
 XINETD
 RCSTOP
@@ -915,8 +911,6 @@ with_rcstart
 with_rcstop
 with_xinetd
 with_languages
-with_bundledir
-with_bundlelang
 with_exe_file_perm
 with_config_file_perm
 with_cupsd_file_perm
@@ -1504,7 +1498,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CUPS 2.4.12 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.4.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1570,7 +1564,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.4.12:";;
+     short | recursive ) echo "Configuration of CUPS 2.4.13:";;
    esac
   cat <<\_ACEOF
 
@@ -1649,9 +1643,6 @@ Optional Packages:
   --with-rcstop           set stop number for rc scripts
   --with-xinetd           set path for xinetd config files
   --with-languages        set installed languages, default=all
-  --with-bundledir        set localization bundle directory
-  --with-bundlelang       set localization bundle base language (English or
-                          en)
   --with-exe-file-perm    set default executable permissions value,
                           default=0755
   --with-config-file-perm set default ConfigFilePerm value, default=0640
@@ -1758,7 +1749,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.4.12
+CUPS configure 2.4.13
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2113,7 +2104,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CUPS $as_me 2.4.12, which was
+It was created by CUPS $as_me 2.4.13, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3244,8 +3235,8 @@ done
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.4.12"
-CUPS_API_VERSION="$(echo 2.4.12 | awk -F. '{print $1 "." $2}')"
+CUPS_VERSION="2.4.13"
+CUPS_API_VERSION="$(echo 2.4.13 | awk -F. '{print $1 "." $2}')"
 CUPS_BUILD="cups-$CUPS_VERSION"
 
 
@@ -11522,75 +11513,6 @@ fi
 
 
 
-# Check whether --with-bundledir was given.
-if test ${with_bundledir+y}
-then :
-  withval=$with_bundledir;
-    CUPS_BUNDLEDIR="$withval"
-
-else $as_nop
-
-    if test "x$host_os_name" = xdarwin -a $host_os_version -ge 100
-then :
-
-        CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
-	LANGUAGES=""
-
-else $as_nop
-
-	CUPS_BUNDLEDIR=""
-
-fi
-
-fi
-
-
-
-if test "x$CUPS_BUNDLEDIR" != x
-then :
-
-
-printf "%s\n" "#define CUPS_BUNDLEDIR \"$CUPS_BUNDLEDIR\"" >>confdefs.h
-
-
-fi
-
-
-# Check whether --with-bundlelang was given.
-if test ${with_bundlelang+y}
-then :
-  withval=$with_bundlelang;
-    cups_bundlelang="$withval"
-
-else $as_nop
-
-    if test $host_os_version -ge 190
-then :
-
-	cups_bundlelang="en"
-
-else $as_nop
-
-	cups_bundlelang="English"
-
-fi
-
-fi
-
-
-if test "x$cups_bundlelang" != x -a "x$CUPS_BUNDLEDIR" != x
-then :
-
-    CUPS_RESOURCEDIR="$CUPS_BUNDLEDIR/Resources/$cups_bundlelang.lproj"
-
-else $as_nop
-
-    CUPS_RESOURCEDIR=""
-
-fi
-
-
-
 # Check whether --with-exe_file_perm was given.
 if test ${with_exe_file_perm+y}
 then :
@@ -12369,14 +12291,10 @@ fi
 
 
 
-INSTALL_LANGUAGES=""
-UNINSTALL_LANGUAGES=""
 LANGFILES=""
 if test "x$LANGUAGES" != x
 then :
 
-    INSTALL_LANGUAGES="install-languages"
-    UNINSTALL_LANGUAGES="uninstall-languages"
     for lang in $LANGUAGES; do
 	if test -f doc/$lang/index.html.in
 then :
@@ -12393,17 +12311,8 @@ then :
 fi
     done
 
-elif test "x$CUPS_BUNDLEDIR" != x
-then :
-
-    INSTALL_LANGUAGES="install-langbundle"
-    UNINSTALL_LANGUAGES="uninstall-langbundle"
-
 fi
 
-
-
-
 ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES"
 
 cat >confcache <<\_ACEOF
@@ -12905,7 +12814,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.4.12, which was
+This file was extended by CUPS $as_me 2.4.13, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12970,7 +12879,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-CUPS config.status 2.4.12
+CUPS config.status 2.4.13
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -13,7 +13,7 @@ dnl We need at least autoconf 2.71...
 AC_PREREQ([2.71])
 
 dnl Package name and version...
-AC_INIT([CUPS],[2.4.12],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups])
+AC_INIT([CUPS],[2.4.13],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups])
 
 dnl This line is provided to ensure that you don't run the autoheader program
 dnl against this project.  Doing so is completely unsupported and WILL cause
@@ -42,12 +42,8 @@ sinclude(config-scripts/cups-defaults.m4)
 
 dnl See what languages are available and make sure we generate the localization
 dnl files as needed...
-INSTALL_LANGUAGES=""
-UNINSTALL_LANGUAGES=""
 LANGFILES=""
 AS_IF([test "x$LANGUAGES" != x], [
-    INSTALL_LANGUAGES="install-languages"
-    UNINSTALL_LANGUAGES="uninstall-languages"
     for lang in $LANGUAGES; do
 	AS_IF([test -f doc/$lang/index.html.in], [
 	    LANGFILES="$LANGFILES doc/$lang/index.html"
@@ -57,14 +53,8 @@ AS_IF([test "x$LANGUAGES" != x], [
 	    LANGFILES="$LANGFILES templates/$lang/header.tmpl"
 	])
     done
-], [test "x$CUPS_BUNDLEDIR" != x], [
-    INSTALL_LANGUAGES="install-langbundle"
-    UNINSTALL_LANGUAGES="uninstall-langbundle"
 ])
 
-AC_SUBST([INSTALL_LANGUAGES])
-AC_SUBST([UNINSTALL_LANGUAGES])
-
 dnl Provide autoconf with a list of files to generate and output them...
 AC_CONFIG_FILES([
     Makedefs