[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5a2ebd32c0fdbda840271796c8d25a8e36b7c84b

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5a2ebd32c0fdbda840271796c8d25a8e36b7c84b

[git]

[-- Attachment #1: Type: text/plain, Size: 3375 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 2.x development tree".

The branch, next has been updated
       via  5a2ebd32c0fdbda840271796c8d25a8e36b7c84b (commit)
       via  86667d0c7a32054bea49dcbf1f90803b6170a581 (commit)
       via  96473f525dcec4115b9bab0b305ff5b92194b134 (commit)
       via  6920fbe86df2cacefc1a91b9590d84a495734e65 (commit)
       via  13e6019b926169ddadeb3fe6f3fc77f69f6a66d3 (commit)
       via  9324732071de3b33db6a30452b3ab1134c4bd5e2 (commit)
       via  a3f77ded659c607ea1c00e9500aece0418ec5c4a (commit)
       via  cd4437eaa76be37161820c37725dd788f57c0ac2 (commit)
       via  901e172c91a4a74de635d931839effd03851418d (commit)
       via  9f9d4e3c74ba61783dad3ddcedbc9b920b67a327 (commit)
      from  868d2a1fff7d6c217bd860567a956f27d0851e78 (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 5a2ebd32c0fdbda840271796c8d25a8e36b7c84b
Merge: 868d2a1 86667d0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Oct 22 10:33:46 2016 +0200

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/core/106/filelists/files | 1 -
 make.sh                                   | 2 +-
 src/setup/passwords.c                     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index fd363f3..a67d30a 100644
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -22,5 +22,4 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/services.cgi
-usr/sbin/setup
 var/ipfire/backup/include
diff --git a/make.sh b/make.sh
index 8faa83a..e30c075 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
 CORE="106"							# Core Level (Filename)
-PAKFIRE_CORE="105"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="106"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
diff --git a/src/setup/passwords.c b/src/setup/passwords.c
index 50ee38e..e7b4b52 100644
--- a/src/setup/passwords.c
+++ b/src/setup/passwords.c
@@ -56,7 +56,7 @@ int handleadminpassword(void)
 		return 0;
 	
 	snprintf(commandstring, STRING_SIZE,
-		"/usr/sbin/htpasswd -c -s -b " CONFIG_ROOT "/auth/users admin '%s'", password);
+		"/usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", password);
 	sprintf(message, _("Setting %s 'admin' user password..."), NAME);
 	if (runhiddencommandwithstatus(commandstring, _("Setting password"), message, NULL)) {
 		sprintf(message, _("Problem setting %s 'admin' user password."), NAME);


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