public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. edefe559ce691fd7c3c9f24ed2b567b994c3f497
@ 2026-06-04 10:30 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-06-04 10:30 UTC (permalink / raw)
  To: ipfire-scm

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 2.x development tree".

The branch, next has been updated
       via  edefe559ce691fd7c3c9f24ed2b567b994c3f497 (commit)
       via  72aec20eeaf4a793bdf45b3a995fa7e4b87c31b4 (commit)
      from  ba4bb0af5a86b78e7b2b177ef58bbd9bd20c0bca (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 edefe559ce691fd7c3c9f24ed2b567b994c3f497
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Jun 4 10:30:30 2026 +0000

    core203: Ship nss-myhostname
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 72aec20eeaf4a793bdf45b3a995fa7e4b87c31b4
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Jun 4 10:28:35 2026 +0000

    Revert "nss-myhostname: Drop package"
    
    This reverts commit 2e1d6ebc66da5a8d03e2c10b8bbd9d328d210782.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/etc/nsswitch.conf                                          | 2 +-
 config/rootfiles/common/nss-myhostname                            | 4 ++++
 .../rootfiles/{oldcore/123 => core/203}/filelists/nss-myhostname  | 0
 config/rootfiles/core/203/update.sh                               | 4 ----
 lfs/{swig => nss-myhostname}                                      | 8 ++++----
 make.sh                                                           | 1 +
 6 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 config/rootfiles/common/nss-myhostname
 copy config/rootfiles/{oldcore/123 => core/203}/filelists/nss-myhostname (100%)
 copy lfs/{swig => nss-myhostname} (92%)

Difference in files:
diff --git a/config/etc/nsswitch.conf b/config/etc/nsswitch.conf
index 067e63b48..468fd1c88 100644
--- a/config/etc/nsswitch.conf
+++ b/config/etc/nsswitch.conf
@@ -4,7 +4,7 @@ passwd: files
 group: files
 shadow: files
 
-hosts: files dns
+hosts: files dns myhostname
 networks: files
 
 protocols: files
diff --git a/config/rootfiles/common/nss-myhostname b/config/rootfiles/common/nss-myhostname
new file mode 100644
index 000000000..13f38ae42
--- /dev/null
+++ b/config/rootfiles/common/nss-myhostname
@@ -0,0 +1,4 @@
+lib/libnss_myhostname.so.2
+#usr/share/doc/nss-myhostname
+#usr/share/doc/nss-myhostname/README.html
+#usr/share/doc/nss-myhostname/style.css
diff --git a/config/rootfiles/core/203/filelists/nss-myhostname b/config/rootfiles/core/203/filelists/nss-myhostname
new file mode 120000
index 000000000..7d8203185
--- /dev/null
+++ b/config/rootfiles/core/203/filelists/nss-myhostname
@@ -0,0 +1 @@
+../../../common/nss-myhostname
\ No newline at end of file
diff --git a/config/rootfiles/core/203/update.sh b/config/rootfiles/core/203/update.sh
index 5aea2ff66..fb383d4e7 100644
--- a/config/rootfiles/core/203/update.sh
+++ b/config/rootfiles/core/203/update.sh
@@ -103,10 +103,6 @@ rm -rfv \
 rm -vf \
 	/usr/lib/libboost*.so.1.89.0
 
-# Remove nss-myhostname
-rm -vf \
-	/lib/libnss_myhostname.so.2
-
 # update linker config
 ldconfig
 
diff --git a/lfs/nss-myhostname b/lfs/nss-myhostname
new file mode 100644
index 000000000..91c802b4d
--- /dev/null
+++ b/lfs/nss-myhostname
@@ -0,0 +1,78 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.3
+
+THISAPP    = nss-myhostname-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 99b9cc42c8dc5a73afe9dddfad6c05d175246ffb7985fb90b3f1bab96c8b5afde012e41f5770d2671eefd1f86be81b576637994bffb5e00adab7ac2c986c09b7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index b317d0418..b7fe2869d 100755
--- a/make.sh
+++ b/make.sh
@@ -2120,6 +2120,7 @@ build_system() {
 	lfsmake2 iftop
 	lfsmake2 mdns-repeater
 	lfsmake2 i2c-tools
+	lfsmake2 nss-myhostname
 	lfsmake2 dehydrated
 	lfsmake2 libplist
 	lfsmake2 nqptp


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-04 10:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-04 10:30 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. edefe559ce691fd7c3c9f24ed2b567b994c3f497 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox