This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 75dc404ae5641ee4320e8f2b5ce46f2571b8afb6 (commit) via 0ca9f6d40a9ed5a1ac7a608970a76c4fc3172675 (commit) via 84292e3e54e394c9cb3f2e6d1e90a866532e7210 (commit) from 6738176b82a737a450253b17eac954fa130f111b (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 75dc404ae5641ee4320e8f2b5ce46f2571b8afb6 Merge: 0ca9f6d 6738176 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:39:39 2011 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 0ca9f6d40a9ed5a1ac7a608970a76c4fc3172675 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:39:20 2011 +0200

cups: Remove unused code.

commit 84292e3e54e394c9cb3f2e6d1e90a866532e7210 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 7 23:52:02 2011 +0200

bash: Add scriptlets to initialize /etc/shells.

-----------------------------------------------------------------------

Summary of changes: bash/bash.nm | 32 +++++++++++++++++++++++++++++++- cups/cups.nm | 7 +------ 2 files changed, 32 insertions(+), 7 deletions(-)

Difference in files: diff --git a/bash/bash.nm b/bash/bash.nm index bc9662d..0c57eab 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -5,7 +5,7 @@

name = bash version = 4.2 -release = 2 +release = 3

groups = Base Build System/Tools url = http://www.gnu.org/software/bash/ @@ -68,5 +68,35 @@ end packages package %{name} requires = /etc/bashrc /etc/profile + + script postin + # Create /etc/shells, if it does not exist. + [ -f "/etc/shells" ] || touch /etc/shells + + if ! grep -q "/bin/bash" /etc/shells; then + echo "/bin/bash" >> /etc/shells + fi + + if ! grep -q "/bin/sh" /etc/shells; then + echo "/bin/sh" >> /etc/shells + fi + end + + script postun + [ -e "/etc/shells" ] || exit 0 + + # Remove /bin/bash and /bin/sh from /etc/shells. + while read line; do + if [[ $line =~ ^/bin/sh ]]; then + continue + elif [[ $line =~ ^/bin/bash ]]; then + continue + fi + + echo "${line}" + done < /etc/shells > /etc/shells.$$ + + mv -f /etc/shells{.$$,} + end end end diff --git a/cups/cups.nm b/cups/cups.nm index 9a78e98..9e8606e 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -5,7 +5,7 @@

name = cups version = 1.4.5 -release = 5 +release = 6

groups = Applications/Printing url = http://cups.org/software.php @@ -74,11 +74,6 @@ build end end

-# XXX what is this? -# This line has to be added at the installation of cups. -# File: /lib/udev/rules.d/99-systemd.rules -# Line: SUBSYSTEM=="usb", ATTR{serial}=="AL01077498", TAG+="systemd", ENV{SYSTEMD_WANTS}="cups.service" - packages package %{name} requires = ghostscript

hooks/post-receive -- IPFire 3.x development tree