[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 50b7f3a2894fac678924095cf5e52c9b3fad86f3

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 50b7f3a2894fac678924095cf5e52c9b3fad86f3

[git]

[-- Attachment #1: Type: text/plain, Size: 3293 bytes --]

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  50b7f3a2894fac678924095cf5e52c9b3fad86f3 (commit)
      from  9ff3c3c7fa63280fc52fff4c9a7665e82d4319ac (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 50b7f3a2894fac678924095cf5e52c9b3fad86f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 10 11:08:03 2013 +0200

    nss-myhostname: Move files to /usr (UsrMove).
    
    Also split description, which is a bit long-ish
    and automatically enable myhostname, when the
    package is installed.

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

Summary of changes:
 nss-myhostname/nss-myhostname.nm | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/nss-myhostname/nss-myhostname.nm b/nss-myhostname/nss-myhostname.nm
index e3fc8bf..6b66c1b 100644
--- a/nss-myhostname/nss-myhostname.nm
+++ b/nss-myhostname/nss-myhostname.nm
@@ -5,7 +5,7 @@
 
 name       = nss-myhostname
 version    = 0.3
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = http://0pointer.de/lennart/projects/nss-myhostname/
@@ -16,7 +16,9 @@ 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
+	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
@@ -31,12 +33,9 @@ end
 source_dl  =
 
 build
-	configure_options += \
-		--libdir=/%{lib}
-
 	install_cmds
 		mkdir -pv %{BUILDROOT}%{libdir}
-		ln -svf ../../%{lib}/libnss_myhostname.so.2 \
+		ln -svf libnss_myhostname.so.2 \
 			%{BUILDROOT}%{libdir}/libnss_myhostname.so
 
 		rm -rf %{BUILDROOT}/usr/share/doc/nss-myhostname
@@ -45,6 +44,33 @@ 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


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