From be691e6ff90fe4c34378e4f3593b7efc28973aed Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: May 07 2020 18:56:01 +0000 Subject: tag 0.34.5 - Update our copy of the .spec file to match Fedora's. - Update REPOSITORY in the top-level Makefile to point to pagure.io instead of guessing based on the "remote" git repo, which with pagure can be a fork. - Bump version to 0.34.5. Signed-off-by: Nalin Dahyabhai --- diff --git a/Makefile.am b/Makefile.am index 9c26cdb..dc4fdb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = src scripts python sample tests doc EXTRA_DIST = oddjob.spec oddjobconfig.dtd.in QUICKSTART TODO doc/oddjob.html +ACLOCAL_AMFLAGS = -I m4 CONFIGURE_DEPENDENCIES = $(top_srcdir)/oddjob.spec VERSION=$(shell grep ^Version: $(top_srcdir)/oddjob.spec | awk '{print $$NF}') @@ -16,7 +17,7 @@ tag: compare_versions force-tag: compare_versions git tag -f $(TAG) -REPOSITORY=$(shell git config remote.origin.url 2> /dev/null || /bin/pwd) +REPOSITORY=ssh://git@pagure.io/oddjob.git ARCHIVEOUTDIR=$(shell cd $(top_srcdir) && pwd) archive: diff --git a/oddjob.spec b/oddjob.spec index 39ba904..a0e5c22 100644 --- a/oddjob.spec +++ b/oddjob.spec @@ -21,16 +21,15 @@ %endif Name: oddjob -Version: 0.34.4 +Version: 0.34.5 Release: 1%{?dist} Source0: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz -#Source1: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz.sig +Source1: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz.sig Summary: A D-Bus service which runs odd jobs on behalf of client applications License: BSD -Group: System Environment/Daemons -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gcc BuildRequires: dbus-devel >= 0.22, dbus-x11, libselinux-devel, libxml2-devel -BuildRequires: pam-devel, python-devel, pkgconfig +BuildRequires: pam-devel, pkgconfig BuildRequires: cyrus-sasl-devel, krb5-devel, openldap-devel BuildRequires: docbook-dtds, xmlto %if %{systemd} @@ -70,7 +69,6 @@ oddjob is a D-Bus service which performs particular tasks for clients which connect to it and issue requests using the system-wide message bus. %package mkhomedir -Group: System Environment/Daemons Summary: An oddjob helper which creates and populates home directories Requires: %{name} = %{version}-%{release} Requires(post): %{dbus_send}, grep, sed, psmisc @@ -81,7 +79,6 @@ pam_oddjob_mkhomedir module to create a home directory for a user at login-time. %package sample -Group: System Environment/Daemons Summary: A sample oddjob service. Requires: %{name} = %{version}-%{release} @@ -140,11 +137,7 @@ chmod -x src/reload src/mkhomedirfor src/mkmyhomedir touch -r src/oddjobd-mkhomedir.conf.in $RPM_BUILD_ROOT/%{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf touch -r src/oddjob-mkhomedir.conf.in $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/oddjob-mkhomedir.conf -%clean -rm -fr "$RPM_BUILD_ROOT" - %files -%defattr(-,root,root,-) %doc *.dtd COPYING NEWS QUICKSTART doc/oddjob.html src/reload %if ! %{build_sample_subpackage} %doc sample-install-root/sample @@ -169,7 +162,6 @@ rm -fr "$RPM_BUILD_ROOT" %{_mandir}/*/oddjobd-introspection.* %files mkhomedir -%defattr(-,root,root) %doc src/mkhomedirfor src/mkmyhomedir %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/mkhomedir @@ -186,7 +178,6 @@ rm -fr "$RPM_BUILD_ROOT" %if %{build_sample_subpackage} %files sample -%defattr(-,root,root) %{_libdir}/%{name}/oddjob-sample.sh %config %{_sysconfdir}/dbus-*/system.d/oddjob-sample.conf %config %{_sysconfdir}/oddjobd.conf.d/oddjobd-sample.conf @@ -255,6 +246,39 @@ fi exit 0 %changelog +* Thu May 7 2020 Nalin Dahyabhai - 0.34.5-1 +- apply patch from Matthias Gerstner of the SUSE security team to fix a + possible race condition in the mkhomedir helper (CVE-2020-10737) + +* Wed Jan 29 2020 Fedora Release Engineering - 0.34.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.34.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.34.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 4 2018 Nalin Dahyabhai - 0.34.4-7 +- Drop Python 2 build-time dependency, which hasn't been used since we turned + off building the python bindings years ago (#1595853, #1642502). + +* Fri Jul 13 2018 Fedora Release Engineering - 0.34.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 19 2018 Iryna Shcherbina - 0.34.4-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Thu Feb 08 2018 Fedora Release Engineering - 0.34.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.34.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.34.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Feb 26 2017 Nalin Dahyabhai - 0.34.4-1 - when "prepend_user_name" is used, the user name is now added to the helper's command line after arguments that were specified in the helper "exec"