[rpms/setup] update_services: provide a way how to override set envvars through sh.local file(#1344007)

[rpms/setup] update_services: provide a way how to override set envvars through sh.local file(#1344007)

[@ 2026-06-22 15:55 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/setup
Branch : update_services
Commit : 44e2f003d1985a0c688620c89f946d162427f5aa
Author : Ondřej Vašík <ovasik@redhat.com>
Date   : 2017-11-17T09:29:27+01:00
Stats  : +12/-4 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/setup/c/44e2f003d1985a0c688620c89f946d162427f5aa?branch=update_services

Log:
provide a way how to override set envvars through sh.local file(#1344007)

---
diff --git a/.gitignore b/.gitignore
index 7719c0c..12b7c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ setup-2.8.25.tar.bz2
 /setup-2.10.8.tar.bz2
 /setup-2.10.9.tar.bz2
 /setup-2.10.10.tar.bz2
+/setup-2.11.1.tar.bz2

diff --git a/setup.spec b/setup.spec
index 9d43b9c..3fd3769 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,11 +1,11 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.10.10
+Version: 2.11.1
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
-URL: https://pagure.io/setup
-Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
+URL: https://fedorahosted.org/setup/
+Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRequires: bash tcsh perl-interpreter
 #require system release for saner dependency order
@@ -40,6 +40,8 @@ chmod 0644 %{buildroot}/etc/environment
 chmod 0400 %{buildroot}/etc/{shadow,gshadow}
 chmod 0644 %{buildroot}/var/log/lastlog
 touch %{buildroot}/etc/fstab
+mkdir -p %{buildroot}/etc/profile.d
+echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}/etc/Makefile
@@ -91,11 +93,16 @@ end
 %config(noreplace) /etc/csh.login
 %config(noreplace) /etc/csh.cshrc
 %dir /etc/profile.d
+%config(noreplace) /etc/profile.d/sh.local
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Fri Nov 17 2017 Ondrej Vasik <ovasik@redhat.com> - 2.11.1-1
+- saslauthd belongs to cyrus-sasl and cyrus-imap packages
+- provide a way how to override set envvars through sh.local file(#1344007)
+
 * Mon Sep 04 2017 Ondrej Vasik <ovasik@redhat.com> - 2.10.10-1
 - we need to source /etc/bashrc from /etc/profile for bash
 

diff --git a/sources b/sources
index ee01b5d..2e723c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setup-2.10.10.tar.bz2) = 61edbdb3cc5e660859aac478146e9ad5d47acbdecbb4ca1cf3c2d1d665b04505fe40ce98a019aeb73dc1b6fb4fc6d4a2d7354588aee3326d8a30a5d638c7989a
+SHA512 (setup-2.11.1.tar.bz2) = 3e5832e15c4a76705db5d76643cb03cb77d95b55091ff6ae6ba3945647106ac17d1d012ce5830a38a4de58f5e424517a4b5a6223df9bfa588b3ba8ef35ab1ed6