diff -Nru oddjob-0.34.6/aclocal.m4 oddjob-0.34.7/aclocal.m4 --- oddjob-0.34.6/aclocal.m4 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/aclocal.m4 2020-12-14 16:55:51.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +379,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +395,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +454,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -485,7 +485,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -676,7 +676,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,7 +715,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -742,7 +744,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -939,7 +941,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -960,7 +962,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -982,7 +984,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1017,7 +1019,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1062,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1099,7 +1101,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1128,7 +1130,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1175,7 +1177,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1413,7 +1415,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1432,7 +1434,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1513,7 +1515,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1573,7 +1575,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1601,7 +1603,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1620,7 +1622,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/compile oddjob-0.34.7/compile --- oddjob-0.34.6/compile 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/compile 2020-12-14 16:55:52.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru oddjob-0.34.6/configure oddjob-0.34.7/configure --- oddjob-0.34.6/configure 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/configure 2020-12-14 16:55:51.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for oddjob 0.34.4. +# Generated by GNU Autoconf 2.69 for oddjob 0.34.7. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='oddjob' PACKAGE_TARNAME='oddjob' -PACKAGE_VERSION='0.34.4' -PACKAGE_STRING='oddjob 0.34.4' +PACKAGE_VERSION='0.34.7' +PACKAGE_STRING='oddjob 0.34.7' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1409,7 +1409,7 @@ # 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 oddjob 0.34.4 to adapt to many kinds of systems. +\`configure' configures oddjob 0.34.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,7 +1479,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of oddjob 0.34.4:";; + short | recursive ) echo "Configuration of oddjob 0.34.7:";; esac cat <<\_ACEOF @@ -1616,7 +1616,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -oddjob configure 0.34.4 +oddjob configure 0.34.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2027,7 +2027,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by oddjob $as_me 0.34.4, which was +It was created by oddjob $as_me 0.34.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2898,7 +2898,7 @@ # Define the identity of the package. PACKAGE='oddjob' - VERSION='0.34.4' + VERSION='0.34.7' cat >>confdefs.h <<_ACEOF @@ -14622,7 +14622,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by oddjob $as_me 0.34.4, which was +This file was extended by oddjob $as_me 0.34.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14688,7 +14688,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -oddjob config.status 0.34.4 +oddjob config.status 0.34.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15825,7 +15825,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -Nru oddjob-0.34.6/configure.ac oddjob-0.34.7/configure.ac --- oddjob-0.34.6/configure.ac 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/configure.ac 2020-12-14 16:55:44.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT(oddjob,0.34.4) +AC_INIT(oddjob,0.34.7) AC_PREREQ(2.59) PACKAGE_NAME_CAPS=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` AC_DEFINE_UNQUOTED(PACKAGE_NAME_CAPS,"$PACKAGE_NAME_CAPS",[Define to the package name, in caps.]) diff -Nru oddjob-0.34.6/debian/changelog oddjob-0.34.7/debian/changelog --- oddjob-0.34.6/debian/changelog 2020-06-01 19:20:10.000000000 +0000 +++ oddjob-0.34.7/debian/changelog 2022-03-20 13:52:31.000000000 +0000 @@ -1,3 +1,12 @@ +oddjob (0.34.7-1) unstable; urgency=medium + + * New upstream version. + * control: Drop libldap2-dev from build-depends. (Closes: #1007972) + * control: Bump policy to 4.6.0. + * control: Bump debhelper-compat to 13. + + -- Timo Aaltonen Sun, 20 Mar 2022 15:52:31 +0200 + oddjob (0.34.6-1) unstable; urgency=medium * New upstream release. (Closes: #956352, #960089) diff -Nru oddjob-0.34.6/debian/control oddjob-0.34.7/debian/control --- oddjob-0.34.6/debian/control 2020-06-01 19:18:50.000000000 +0000 +++ oddjob-0.34.7/debian/control 2022-03-20 13:44:53.000000000 +0000 @@ -4,11 +4,10 @@ Maintainer: Debian FreeIPA Team Uploaders: Timo Aaltonen Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), dbus, libdbus-1-dev, libkrb5-dev, - libldap2-dev, libpam-dev, libsasl2-dev, libselinux1-dev, @@ -16,7 +15,7 @@ pkg-config, systemd, xmlto, -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Homepage: https://pagure.io/oddjob/ Vcs-Git: https://salsa.debian.org/freeipa-team/oddjob.git Vcs-Browser: https://salsa.debian.org/freeipa-team/oddjob diff -Nru oddjob-0.34.6/debian/rules oddjob-0.34.7/debian/rules --- oddjob-0.34.6/debian/rules 2020-06-01 19:17:35.000000000 +0000 +++ oddjob-0.34.7/debian/rules 2022-03-20 13:45:05.000000000 +0000 @@ -30,6 +30,3 @@ $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}/ dh_install - -override_dh_missing: - dh_missing --fail-missing diff -Nru oddjob-0.34.6/depcomp oddjob-0.34.7/depcomp --- oddjob-0.34.6/depcomp 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/depcomp 2020-12-14 16:55:52.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru oddjob-0.34.6/doc/Makefile.in oddjob-0.34.7/doc/Makefile.in --- oddjob-0.34.6/doc/Makefile.in 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/doc/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/install-sh oddjob-0.34.7/install-sh --- oddjob-0.34.6/install-sh 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/install-sh 2020-12-14 16:55:52.000000000 +0000 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -Nru oddjob-0.34.6/Makefile.in oddjob-0.34.7/Makefile.in --- oddjob-0.34.6/Makefile.in 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -140,8 +140,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -652,6 +652,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -694,6 +698,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -871,18 +877,18 @@ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff -Nru oddjob-0.34.6/missing oddjob-0.34.7/missing --- oddjob-0.34.6/missing 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/missing 2020-12-14 16:55:52.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru oddjob-0.34.6/oddjob.spec oddjob-0.34.7/oddjob.spec --- oddjob-0.34.6/oddjob.spec 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/oddjob.spec 2020-12-14 16:55:44.000000000 +0000 @@ -21,7 +21,7 @@ %endif Name: oddjob -Version: 0.34.6 +Version: 0.34.7 Release: 1%{?dist} Source0: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz Source1: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz.sig @@ -246,6 +246,10 @@ exit 0 %changelog +* Mon Dec 14 18:44:51 EET 2020 Alexander Bokovoy - 0.34.7-1 +- Read HOME_MODE and UMASK from /etc/login.defs +- Default to LC_ALL=C.UTF-8 in systemd service environment + * Thu May 7 2020 Nalin Dahyabhai - 0.34.6-1 - update license on src/buffer.h - change /var/run -> /run in systemd service file (Orion Poplawski) diff -Nru oddjob-0.34.6/python/Makefile.in oddjob-0.34.7/python/Makefile.in --- oddjob-0.34.6/python/Makefile.in 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/python/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/sample/Makefile.in oddjob-0.34.7/sample/Makefile.in --- oddjob-0.34.6/sample/Makefile.in 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/sample/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/scripts/Makefile.in oddjob-0.34.7/scripts/Makefile.in --- oddjob-0.34.6/scripts/Makefile.in 2020-05-11 13:44:18.000000000 +0000 +++ oddjob-0.34.7/scripts/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/scripts/oddjobd.service.in oddjob-0.34.7/scripts/oddjobd.service.in --- oddjob-0.34.6/scripts/oddjobd.service.in 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/scripts/oddjobd.service.in 2020-12-14 16:55:44.000000000 +0000 @@ -5,6 +5,7 @@ [Service] Type=simple PIDFile=/run/oddjobd.pid +Environment=LC_ALL=C.UTF-8 ExecStart=@sbindir@/oddjobd -n -p /run/oddjobd.pid -t 300 [Install] diff -Nru oddjob-0.34.6/src/Makefile.in oddjob-0.34.7/src/Makefile.in --- oddjob-0.34.6/src/Makefile.in 2020-05-11 13:44:19.000000000 +0000 +++ oddjob-0.34.7/src/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/src/mkhomedir.c oddjob-0.34.7/src/mkhomedir.c --- oddjob-0.34.6/src/mkhomedir.c 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/src/mkhomedir.c 2020-12-14 16:55:44.000000000 +0000 @@ -264,12 +264,13 @@ } static mode_t -get_umask(int *configured) +get_umask(int *configured, const char *variable) { FILE *fp; char buf[BUFSIZ], *p, *end; mode_t mask = umask(0777); long tmp; + size_t vlen = strlen(variable); fp = fopen("/etc/login.defs", "r"); if (fp != NULL) { @@ -279,10 +280,10 @@ } buf[strcspn(buf, "\r\n")] = '\0'; p = buf + strspn(buf, " \t"); - if (strncmp(p, "UMASK", 5) != 0) { + if (strncmp(p, variable, vlen) != 0) { continue; } - p += 5; + p += vlen; if (strspn(p, " \t") == 0) { continue; } @@ -308,7 +309,11 @@ int i, configured_umask = 0, flags = FLAG_POPULATE; openlog(PACKAGE "-mkhomedir", LOG_PID, LOG_DAEMON); - override_umask = get_umask(&configured_umask); + /* Unlike UMASK, HOME_MODE is the file mode, so needs to be reverted */ + override_umask = 0777 & ~get_umask(&configured_umask, "HOME_MODE"); + if (configured_umask == 0) { + override_umask = get_umask(&configured_umask, "UMASK"); + } umask(override_umask); skel_dir = "/etc/skel"; diff -Nru oddjob-0.34.6/src/oddjob_dbus.c oddjob-0.34.7/src/oddjob_dbus.c --- oddjob-0.34.6/src/oddjob_dbus.c 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/src/oddjob_dbus.c 2020-12-14 16:55:44.000000000 +0000 @@ -634,7 +634,7 @@ oddjob_dbus_filter(DBusConnection *conn, DBusMessage *message, void *user_data) { struct oddjob_dbus_context *ctx; - struct oddjob_dbus_service *srv; + struct oddjob_dbus_service *srv = NULL; struct oddjob_dbus_object *obj; struct oddjob_dbus_interface *interface; struct oddjob_dbus_method *method; diff -Nru oddjob-0.34.6/src/oddjobd-mkhomedir.conf.5.in oddjob-0.34.7/src/oddjobd-mkhomedir.conf.5.in --- oddjob-0.34.6/src/oddjobd-mkhomedir.conf.5.in 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/src/oddjobd-mkhomedir.conf.5.in 2020-12-14 16:55:44.000000000 +0000 @@ -24,7 +24,8 @@ -u Specify a umask whose bits are masked off of contents of the skeleton directory while they are copied to the user's new home directory. The default is read -from \fB/etc/login.defs\fR. +from \fB/etc/login.defs\fR by taking \fBHOME_MODE\fR and \fBUMASK\fR values, in +this order. First found value persists. .SH SEE ALSO \fBoddjob.conf\fR(5) diff -Nru oddjob-0.34.6/src/pam_oddjob_mkhomedir.8.in oddjob-0.34.7/src/pam_oddjob_mkhomedir.8.in --- oddjob-0.34.6/src/pam_oddjob_mkhomedir.8.in 2020-05-11 13:44:14.000000000 +0000 +++ oddjob-0.34.7/src/pam_oddjob_mkhomedir.8.in 2020-12-14 16:55:44.000000000 +0000 @@ -14,8 +14,9 @@ \fImkmyhomedir\fR method. The location of the skeleton directory and the default umask are determined by -the configuration for the corresponding service in \fBoddjobd-mkhomedir.conf\fR, -so they can not be specified as arguments to this module. +the values of \fBHOME_MODE\fR or \fBUMASK\fR (as a fallback) variables in +\fI/etc/login.defs\fR, so they can not be specified as arguments to this +module. If \fID-Bus\fR has not been configured to allow the calling application to invoke these methods provided as part of the \fI@NAMESPACE@.oddjob_mkhomedir\fR diff -Nru oddjob-0.34.6/tests/006/expected_stdout oddjob-0.34.7/tests/006/expected_stdout --- oddjob-0.34.6/tests/006/expected_stdout 2020-05-11 13:44:21.000000000 +0000 +++ oddjob-0.34.7/tests/006/expected_stdout 2020-12-14 16:55:55.000000000 +0000 @@ -1,7 +1,7 @@ [id -u] -2510 +1000 [id -g] -2516 +1000 [pwd] / [stat --printf "%A %-25F %n\n" /proc/$$/fd/*] @@ -17,6 +17,6 @@ [echo $*] [echo `cat`] -nalin foo +abokovoy foo [cat /proc/$$/cmdline] /bin/bash diff -Nru oddjob-0.34.6/tests/007/expected_stdout oddjob-0.34.7/tests/007/expected_stdout --- oddjob-0.34.6/tests/007/expected_stdout 2020-05-11 13:44:21.000000000 +0000 +++ oddjob-0.34.7/tests/007/expected_stdout 2020-12-14 16:55:55.000000000 +0000 @@ -1,7 +1,7 @@ [id -u] -2510 +1000 [id -g] -2516 +1000 [pwd] / [stat --printf "%A %-25F %n\n" /proc/$$/fd/*] @@ -15,7 +15,7 @@ prw------- fifo /proc/$$/fd/2 -rwxr-xr-x regular file /proc/$$/fd/255 [echo $*] -nalin foo +abokovoy foo [echo `cat`] [cat /proc/$$/cmdline] diff -Nru oddjob-0.34.6/tests/008/expected_stdout oddjob-0.34.7/tests/008/expected_stdout --- oddjob-0.34.6/tests/008/expected_stdout 2020-05-11 13:44:21.000000000 +0000 +++ oddjob-0.34.7/tests/008/expected_stdout 2020-12-14 16:55:55.000000000 +0000 @@ -1,4 +1,4 @@ -ODDJOB_CALLING_USER="nalin" +ODDJOB_CALLING_USER="abokovoy" ODDJOB_INTERFACE_NAME="com.redhat.oddjob.test" ODDJOB_METHOD_NAME="printenv" ODDJOB_OBJECT_PATH="/" diff -Nru oddjob-0.34.6/tests/cmdparse/Makefile.in oddjob-0.34.7/tests/cmdparse/Makefile.in --- oddjob-0.34.6/tests/cmdparse/Makefile.in 2020-05-11 13:44:19.000000000 +0000 +++ oddjob-0.34.7/tests/cmdparse/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru oddjob-0.34.6/tests/Makefile.in oddjob-0.34.7/tests/Makefile.in --- oddjob-0.34.6/tests/Makefile.in 2020-05-11 13:44:19.000000000 +0000 +++ oddjob-0.34.7/tests/Makefile.in 2020-12-14 16:55:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it,