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 0d1a903fad2835b6692dac2e4912028b1c581c11 (commit) via ad1ea5349290f17a4133f5aaa12f385944b5a8aa (commit) via 752a62e71b9327ddce25f7e0334b0ed870cd788a (commit) via 16f3dc5d0d38c89ed1e8c1c27e6bbd3441949cd0 (commit) via 443c450cc926a00fb3968d724cfdfee75856d71a (commit) via 50f0e95a45f341c25e1555bd50fe9b029e513786 (commit) via c84c1f1a535fbd300d413fc5d6fc52f019a13a6c (commit) via c11bcb63eeb49201b0e89cc6c52f835efe2ca037 (commit) via e5ec988f237301dacbd6d302c3d81111056c38b3 (commit) via 20173b6dcbab6029149606bdb742b79078e7cb06 (commit) via 98cf99895b5cb2f25a05cdc5431f25827710704a (commit) via 701185d0508245b533e086a3e797c0ed739d4619 (commit) via eef76e845e9b25f6f91566323706dc984f740206 (commit) via b4e90939d2ad420524e2babc0f216cdd868398a8 (commit) via da48125f04ea7d4ce0e0ad7035cc92b94dbb2467 (commit) from d9e45c816d62963e63cbf765b3e1135279692557 (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 0d1a903fad2835b6692dac2e4912028b1c581c11 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 14:09:30 2011 +0200
setup: Mark a lot of files as configuration files.
commit ad1ea5349290f17a4133f5aaa12f385944b5a8aa Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 14:08:42 2011 +0200
kernel: Create an initramfs image after installation.
commit 752a62e71b9327ddce25f7e0334b0ed870cd788a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 14:08:11 2011 +0200
kernel: Change kernel version schema.
commit 16f3dc5d0d38c89ed1e8c1c27e6bbd3441949cd0 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 14:00:57 2011 +0200
pakfire: Update to pakfire 0.9.16 and rename pakfire-build to pakfire-builder.
commit 443c450cc926a00fb3968d724cfdfee75856d71a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:59:58 2011 +0200
perl: The main package does need perl(Carp).
This dependency is not automatically determined.
commit 50f0e95a45f341c25e1555bd50fe9b029e513786 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:58:51 2011 +0200
util-linux: Create /etc/mtab symlink in scriptlet.
commit c84c1f1a535fbd300d413fc5d6fc52f019a13a6c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:55:29 2011 +0200
bash: Replace grep in scriptlet.
grep could not be correctly installed to be available for the install script.
commit c11bcb63eeb49201b0e89cc6c52f835efe2ca037 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:53:45 2011 +0200
samba: Fix some libs that were needed to build the package.
commit e5ec988f237301dacbd6d302c3d81111056c38b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:52:39 2011 +0200
ncurses: Make sure that pakfire never does consider to install older versions.
Older versions have conflicting files because ncurses was split into several subpackages.
commit 20173b6dcbab6029149606bdb742b79078e7cb06 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:52:05 2011 +0200
initscripts: Add scripts to create utmp user and some logfiles.
commit 98cf99895b5cb2f25a05cdc5431f25827710704a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:46:02 2011 +0200
cups: -devel package did not require -libs package.
This is needed in order to link against libcups.
commit 701185d0508245b533e086a3e797c0ed739d4619 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:45:38 2011 +0200
rstp: Enable rstp daemon by default when installing.
commit eef76e845e9b25f6f91566323706dc984f740206 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 13:34:16 2011 +0200
chrony: Fix install scripts and create 16 chars key.
commit b4e90939d2ad420524e2babc0f216cdd868398a8 Merge: d9e45c8 da48125 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 12:42:05 2011 +0200
Merge remote-tracking branch 'maniacikarus/samba'
commit da48125f04ea7d4ce0e0ad7035cc92b94dbb2467 Author: Christian Schmidt christian.schmidt@iipfire.org Date: Sun Oct 16 13:33:06 2011 +0200
samba: Updated to latest stable 3.6.0.
-----------------------------------------------------------------------
Summary of changes: bash/bash.nm | 21 ++++++++++++++++----- chrony/chrony-helper | 2 +- chrony/chrony.nm | 19 ++++++++++--------- cups/cups.nm | 6 ++++-- initscripts/initscripts.nm | 15 ++++++++++++++- kernel/kernel.nm | 12 ++++++++++-- ncurses/ncurses.nm | 6 +++++- pakfire/pakfire.nm | 8 +++++--- perl/perl.nm | 3 ++- rstp/rstp.nm | 16 +++++++++++++++- samba/samba.nm | 10 ++++++++-- setup/setup.nm | 19 ++++++++++++++++++- util-linux/util-linux.nm | 25 +++++++++++-------------- 13 files changed, 119 insertions(+), 43 deletions(-)
Difference in files: diff --git a/bash/bash.nm b/bash/bash.nm index 0c57eab..d9d33b3 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -5,7 +5,7 @@
name = bash version = 4.2 -release = 3 +release = 4
groups = Base Build System/Tools url = http://www.gnu.org/software/bash/ @@ -67,17 +67,28 @@ end
packages package %{name} + prerequires = coreutils 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 + found_sh=0 + found_bash=0 + while read line; do + if [ "/bin/bash" = "${line}" ]; then + found_bash=1 + elif [ "/bin/sh" = "${line}" ]; then + found_sh=1 + fi + done < /etc/shells + + if [ "${found_bash}" = "0" ]; then echo "/bin/bash" >> /etc/shells fi
- if ! grep -q "/bin/sh" /etc/shells; then + if [ "${found_sh}" = "0" ]; then echo "/bin/sh" >> /etc/shells fi end @@ -87,9 +98,9 @@ packages
# Remove /bin/bash and /bin/sh from /etc/shells. while read line; do - if [[ $line =~ ^/bin/sh ]]; then + if [ "/bin/bash" = "${line}" ]; then continue - elif [[ $line =~ ^/bin/bash ]]; then + elif [ "/bin/sh" = "${line}" ]; then continue fi
diff --git a/chrony/chrony-helper b/chrony/chrony-helper index a5bbf84..34add5f 100644 --- a/chrony/chrony-helper +++ b/chrony/chrony-helper @@ -32,7 +32,7 @@ generate_commandkey() { commandkey=$(get_key $commandkeyid) [ -z "$commandkey" ] || return 0
- commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 8) + commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 16) [ -n "$commandkey" ] && echo "$commandkeyid $commandkey" >> $keyfile }
diff --git a/chrony/chrony.nm b/chrony/chrony.nm index fb44fbb..3ab23aa 100644 --- a/chrony/chrony.nm +++ b/chrony/chrony.nm @@ -5,7 +5,7 @@
name = chrony version = 1.26 -release = 6 +release = 7
groups = Base System/Daemons url = http://chrony.tuxfamily.org @@ -73,31 +73,32 @@ end
packages package %{name} - preprequires = shadow-utils systemd-units - configfiles /etc/chrony.conf /etc/chrony.keys end + prerequires = shadow-utils systemd-units + script prein %{create_user} end script postin - /bin/systemctl daemon-reload &>/dev/null - /bin/systemctl enable cronyd.service &>/dev/null + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl --no-reload enable \ + chrony-wait.service chronyd.service >/dev/null 2>&1 || : end script preun /bin/systemctl --no-reload disable \ - chrony-wait.service chronyd.service &>/dev/null - /bin/systemctl stop chrony-wait.service chronyd.service &>/dev/null + chrony-wait.service chronyd.service >/dev/null 2>&1 || : + /bin/systemctl stop chrony-wait.service chronyd.service >/dev/null 2>&1 || : end script postup - /bin/systemctl daemon-reload &>/dev/null - /bin/systemctl try-restart chronyd.service &>/dev/null + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart chronyd.service >/dev/null 2>&1 || : end end end diff --git a/cups/cups.nm b/cups/cups.nm index 9e8606e..3ecdae9 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -5,7 +5,7 @@
name = cups version = 1.4.5 -release = 6 +release = 7
groups = Applications/Printing url = http://cups.org/software.php @@ -17,7 +17,7 @@ description by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems. end
-source_dl = +source_dl = http://ftp.easysw.com/pub/cups/%%7Bversion%7D/ sources = %{thisapp}-source.tar.bz2
build @@ -81,6 +81,8 @@ packages package %{name}-devel template DEVEL + + requires += %{name}-libs=%{thisver} end package %{name}-libs diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index 44ed337..dce2238 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,7 +6,7 @@ name = initscripts epoch = 1 version = 2.99 -release = 7 +release = 8
groups = Base System/Boot url = @@ -76,5 +76,18 @@ packages udev util-linux end + + prerequires = coreutils shadow-utils + + script prein + groupadd -g 22 -r -f utmp + end + + script postin + touch /var/log/{b,w}tmp /var/run/utmp + chown root:utmp /var/log/{b,w}tmp /var/run/utmp + chmod 664 /var/log/wtmp /var/run/utmp + chmod 600 /var/log/btmp + end end end diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 01b2f69..fd5121e 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@
name = kernel version = 3.0.4 -release = 2 +release = 4 thisapp = linux-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -22,7 +22,7 @@ description end
# Version helper variables. -localversion = -%{DISTRO_SNAME}%{release} +localversion = -%{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH} fullver = %{version}%{localversion}
sources = %{thisapp}.tar.gz @@ -97,6 +97,14 @@ packages dracut linux-firmware end + + script posttransin + dracut /boot/initramfs-%{fullver}.img %{fullver} + end + + script preun + rm -f /boot/initramfs-%{fullver}.img + end end package kernel-headers diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 063f472..81d989a 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -5,7 +5,7 @@
name = ncurses version = 5.9 -release = 2 +release = 3
groups = System/Base url = http://invisible-island.net/ncurses/ncurses.html @@ -72,6 +72,8 @@ packages the ncurses-base package. end
+ provides += /usr/share/terminfo + files /usr/share/terminfo end @@ -84,6 +86,8 @@ packages descriptions are included in the ncurses-term package. end
+ conflicts = ncurses<=5.9-1 + files /usr/share/terminfo/*/Eterm* /usr/share/terminfo/*/aterm diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index bd8f296..2de1850 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pakfire -version = 0.9.15 -release = 1 +version = 0.9.16 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Packaging @@ -58,7 +58,7 @@ packages end end - package %{name}-build + package %{name}-builder summary = The pakfire builder. description The tools that are needed to build new pakfire packages. @@ -69,6 +69,8 @@ packages %{name}=%{thisver} quality-agent=%{thisver} end + provides = pakfire-build=%{thisver} + obsoletes = pakfire-build<%{thisver} conflicts = build-essentials
files diff --git a/perl/perl.nm b/perl/perl.nm index 291aa5e..19ff646 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -6,7 +6,7 @@ name = perl version = 5.14.2 # Never reset release in this package, just increase. -release = 8 +release = 9
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Languages @@ -130,6 +130,7 @@ packages package perl requires perl-libs=%{thisver} + perl(Carp) end
provides diff --git a/rstp/rstp.nm b/rstp/rstp.nm index 65e0082..1fb976a 100644 --- a/rstp/rstp.nm +++ b/rstp/rstp.nm @@ -5,7 +5,7 @@
name = rstp version = 0.21 -release = 5 +release = 6
groups = Networking/Tools url = http://git.ipfire.org/?p=thirdparty/rstp.git;a=summary @@ -31,5 +31,19 @@ end
packages package %{name} + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl --no-reload enable rstp.service >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable rstp.service >/dev/null 2>&1 || : + /bin/systemctl stop rstp.service >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart rstp.service >/dev/null 2>&1 || : + end end end diff --git a/samba/samba.nm b/samba/samba.nm index c7591cd..e50b083 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -4,8 +4,8 @@ ###############################################################################
name = samba -version = 3.5.11 -release = 1 +version = 3.6.0 +release = 2
maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons @@ -37,7 +37,9 @@ build automake avahi-devel cups-devel + gettext ncurses-devel + libacl-devel libcap-devel openldap-devel openssl-devel @@ -45,6 +47,7 @@ build popt-devel readline-devel which + zlib-devel end
DIR_APP = %{DIR_SRC}/%{thisapp}/source3 @@ -93,5 +96,8 @@ packages package %{name}-devel template DEVEL + + requires += %{name}-libs=%{thisver} end end + diff --git a/setup/setup.nm b/setup/setup.nm index e8a9b8c..58641f3 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@
name = setup version = 3.0 -release = 2 +release = 3
groups = Base Build System/Base url = @@ -48,5 +48,22 @@ end packages package %{name} requires = iana-etc + + configfiles + /etc/aliases + /etc/exports + /etc/fstab + /etc/group + /etc/gshadow + /etc/host.conf + /etc/hosts + /etc/hosts.allow + /etc/hosts.deny + /etc/motd + /etc/passwd + /etc/printcap + /etc/shadow + /etc/shells + end end end diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 4247cab..36ab421 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux version = 2.19 major_ver = 2.19 -release = 6 +release = 7
groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -82,10 +82,6 @@ build %{BUILDROOT}/usr/share/man/man8/{vipw,vigr}.* rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh
- # Create /etc/mtab symlink - mkdir -pv %{BUILDROOT}/etc - ln -svf /proc/mounts %{BUILDROOT}/etc/mtab - # Set capabilities chmod -v -s %{BUILDROOT}/bin/mount setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/mount @@ -94,13 +90,6 @@ build end end
-# This symlink is allowed to be absolute. -quality-agent - whitelist_symlink - /etc/mtab - end -end - packages package %{name} groups += Base @@ -109,14 +98,22 @@ packages /etc/pam.d/system-auth end
- filter_requires = /proc/.*/mounts - obsoletes = util-linux-ng
conflicts setup<3.0-2 util-linux-ng end + + preprequires += coreutils + + script postin + touch /var/log/lastlog + + # mtab symlink + rm -f /etc/mtab + ln -s /proc/mounts /etc/mtab + end end
# Package information for libblkid
hooks/post-receive -- IPFire 3.x development tree