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 c5fd0a55806e0a65a38f9e3a8e0a80aeda277cb5 (commit) via 519776fd6f0d5cd4903e8703c25cac8abaee028b (commit) from bea58a22c10c35e67050fe9811fd295107c453ba (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 c5fd0a55806e0a65a38f9e3a8e0a80aeda277cb5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 13 23:35:44 2013 +0200
nss-myhostname: Remove package.
This is now shipped with systemd(-libs).
commit 519776fd6f0d5cd4903e8703c25cac8abaee028b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Jun 13 22:18:34 2013 +0200
systemd: Fix conflict with nss-myhostname.
nss-myhostname has become a part of systemd since version 201. So the old nss-myhostname package is obsolet and can be dropped.
Fixes #10370.
-----------------------------------------------------------------------
Summary of changes: nss-myhostname/nss-myhostname.nm | 78 ---------------------------------------- systemd/systemd.nm | 46 +++++++++++++++++++++++- 2 files changed, 45 insertions(+), 79 deletions(-) delete mode 100644 nss-myhostname/nss-myhostname.nm
Difference in files: diff --git a/nss-myhostname/nss-myhostname.nm b/nss-myhostname/nss-myhostname.nm deleted file mode 100644 index 6b66c1b..0000000 --- a/nss-myhostname/nss-myhostname.nm +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = nss-myhostname -version = 0.3 -release = 3 - -groups = System/Libraries -url = http://0pointer.de/lennart/projects/nss-myhostname/ -license = LGPLv2+ -summary = glibc plugin for local system host name resolution. - -description - nss-myhostname is a plugin for the GNU Name Service Switch (NSS) - functionality of the GNU C Library (glibc) providing host name - resolution for the locally configured system hostname as returned by - gethostname(2). - - Various software relies on an always resolvable local - host name. When using dynamic hostnames this is usually achieved by - patching /etc/hosts at the same time as changing the host name. This - however is not ideal since it requires a writable /etc file system and - is fragile because the file might be edited by the administrator at - the same time. nss-myhostname simply returns all locally configure - public IP addresses, or -- if none are configured -- the IPv4 address - 127.0.0.2 (wich is on the local loopback) and the IPv6 address ::1 - (which is the local host) for whatever system hostname is configured - locally. Patching /etc/hosts is thus no longer necessary. -end - -source_dl = - -build - install_cmds - mkdir -pv %{BUILDROOT}%{libdir} - ln -svf libnss_myhostname.so.2 \ - %{BUILDROOT}%{libdir}/libnss_myhostname.so - - rm -rf %{BUILDROOT}/usr/share/doc/nss-myhostname - end -end - -packages - package %{name} - groups += Base - - prerequires - /etc/nsswitch.conf - end - - # Add myhostname to the hosts line of /etc/nsswitch.conf - script postin - if [ -f "/etc/nsswitch.conf" ]; then - sed -i.bak -e ' - /^hosts:/ !b - /<myhostname>/ b - s/[[:blank:]]*$/ myhostname/ - ' /etc/nsswitch.conf - fi - end - - # Remove myhostname from the hosts line of /etc/nsswitch.conf - script postun - if [ -f "/etc/nsswitch.conf" ]; then - sed -i.bak -e ' - /^hosts:/ !b - s/[[:blank:]]+myhostname>// - ' /etc/nsswitch.conf - fi - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index cc9c056..5d971f9 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@
name = systemd version = 204 -release = 2 +release = 3
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -140,6 +140,7 @@ packages python-cairo python-dbus python-gobject3 + %{name}-libs=%{thisver} %{name}-units=%{thisver} util-linux>=2.19 end @@ -273,6 +274,49 @@ packages
package %{name}-libs template LIBS + + groups += Base + + prerequires + /etc/nsswitch.conf + end + + provides + nss-myhostname = %{thisver} + end + + obsoletes + nss-myhostname <= 0.3-3 + end + + conflicts + nss-myhostname <= 0.3-3 + + # Ensure that the version of systemd matches systemd-libs. + systemd > %{thisver} + systemd < %{thisver} + end + + # Add myhostname to the hosts line of /etc/nsswitch.conf + script postin + if [ -f "/etc/nsswitch.conf" ]; then + sed -i.bak -e ' + /^hosts:/ !b + /<myhostname>/ b + s/[[:blank:]]*$/ myhostname/ + ' /etc/nsswitch.conf + fi + end + + # Remove myhostname from the hosts line of /etc/nsswitch.conf + script postun + if [ -f "/etc/nsswitch.conf" ]; then + sed -i.bak -e ' + /^hosts:/ !b + s/[[:blank:]]+myhostname>// + ' /etc/nsswitch.conf + fi + end end
package %{name}-devel
hooks/post-receive -- IPFire 3.x development tree