From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4a50681905af88adb0c4c19e6bc7dfda3dbe3606 Date: Sun, 05 Aug 2018 11:11:13 +0100 Message-ID: <20180805101114.0B10F1081BD5@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7518377292053656247==" List-Id: --===============7518377292053656247== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 4a50681905af88adb0c4c19e6bc7dfda3dbe3606 (commit) via 351567966d83908eb3de7108f79c4eab7a37e1e0 (commit) via b856ad695a29059939b16789d410ef52448c6160 (commit) via 1fb7f56e11729f27cab7c5c3349d2c05a8e41a53 (commit) from 79bcc6f769eff10558db6a2c5d7247e5ced508bb (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 4a50681905af88adb0c4c19e6bc7dfda3dbe3606 Author: Erik Kapfer Date: Sat Aug 4 13:52:32 2018 +0200 tor: Update to version 0.3.3.9 =20 Signed-off-by: Michael Tremer commit 351567966d83908eb3de7108f79c4eab7a37e1e0 Author: Erik Kapfer Date: Sat Aug 4 13:49:00 2018 +0200 nginx: Update to version 1.15.1 =20 Deleted last slash in --prefix configure option to prevent such --> https://forum.ipfire.org/viewtopic.php?t=3D19213#p109787 problems. =20 Signed-off-by: Michael Tremer commit b856ad695a29059939b16789d410ef52448c6160 Author: Matthias Fischer Date: Sat Aug 4 08:35:05 2018 +0200 rng-tools: Update to 6.3.1 =20 Bugfix release, for details see: https://github.com/nhorman/rng-tools/releases =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 1fb7f56e11729f27cab7c5c3349d2c05a8e41a53 Author: Michael Tremer Date: Sat Aug 4 13:39:00 2018 +0100 make.sh: Add command to update list of contributors =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/credits.cgi | 74 ++++++++++++++++++++++++++++++++++++++++++++++= +- lfs/nginx | 10 +++---- lfs/rng-tools | 6 ++-- lfs/tor | 6 ++-- make.sh | 27 +++++++++++++++++- 5 files changed, 110 insertions(+), 13 deletions(-) Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 7cda40251..eb76de72e 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -59,7 +59,79 @@ print <
=20

- Core Developers: + +Michael Tremer, +Arne Fitzenreiter, +Christian Schmidt, +Alexander Marx, +Matthias Fischer, +Stefan Schantl, +Jan Paul Tuecking, +Jonatan Schlag, +Dirk Wagner, +Marcel Lorenz, +Erik Kapfer, +Peter M=C3=BCller, +Alf H=C3=B8gemark, +Ben Schweikert, +Peter Pfeiffer, +Daniel Glanzmann, +Heiner Schmeling, +Timo Eissler, +Daniel Weism=C3=BCller, +Jan Lentfer, +Marcus Scholz, +Ersan Yildirim, +Joern-Ingo Weigert, +Alfred Haas, +Lars Schuhmacher, +Rene Zingel, +Sascha Kilian, +Wolfgang Apolinarski, +Ronald Wiesinger, +Stephan Feddersen, +Daniel Weismueller, +Justin Luth, +Michael Eitelwein, +Bernhard Bitsch, +Dominik Hassler, +Larsen, +Gabriel Rolland, +Anton D. Seliverstov, +Bernhard Bittner, +David Kleuker, +Hans Horsten, +Jakub Ratajczak, +Jorrit de Jonge, +Przemek Zdroik, +Andrew Bellows, +Axel Gembe, +Bernhard Held, +Christoph Anderegg, +Daniel Aleksandersen, +Douglas Duckworth, +Eberhard Beilharz, +Ersan Yildirim Ersan, +Gerd Hoerst, +H. Horsten, +Heino Gutschmidt, +Jan Behrens, +Jochen Kauz, +Julian McConnell, +J=C3=B6rn-Ingo Weigert, +Kay-Michael K=C3=B6hler, +Kim W=C3=B6lfel, +Logan Schmidt, +Nico Prenzel, +Osmar Gonzalez, +Paul T. Simmons, +Robert M=C3=B6ker, +Stefan Ernst, +Stefan Ferstl, +Thomas Ebert, +Timmothy Wilson, +Umberto Parma +

=20
    diff --git a/lfs/nginx b/lfs/nginx index 0fa6250f3..ecbe16221 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-14 IPFire Team = # +# Copyright (C) 2007-18 IPFire Team = # # = # # 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 = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.13.7 +VER =3D 1.15.1 =20 THISAPP =3D nginx-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D nginx -PAK_VER =3D 7 +PAK_VER =3D 8 =20 ############################################################################= ### # Top-level Rules @@ -42,7 +42,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 5fcd056b40cb5c47b053fb14a2a89e7d +$(DL_FILE)_MD5 =3D 2dd5a265c54a76b699443931d80a61b9 =20 install : $(TARGET) =20 @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=3D/usr/share/nginx/ \ + --prefix=3D/usr/share/nginx \ --conf-path=3D/etc/nginx/nginx.conf \ --sbin-path=3D/usr/sbin/nginx \ --pid-path=3D/var/run/nginx.pid \ diff --git a/lfs/rng-tools b/lfs/rng-tools index f9b79d108..c7a358e56 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # +# Copyright (C) 2007-2018 IPFire Team = # # = # # 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 = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 6.2 +VER =3D 6.3.1 =20 THISAPP =3D rng-tools-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D a596ecd89afc584afe48758923fe6195 +$(DL_FILE)_MD5 =3D fe2d38e39ff02d0c7b3585407d51dc64 =20 install : $(TARGET) =20 diff --git a/lfs/tor b/lfs/tor index c646e738d..dcb99adb5 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 0.3.3.7 +VER =3D 0.3.3.9 =20 THISAPP =3D tor-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D tor -PAK_VER =3D 29 +PAK_VER =3D 30 =20 DEPS =3D "" =20 @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 5288d8de30c516073ad13fee44f6fdf3 +$(DL_FILE)_MD5 =3D 16b24bda0772dc3d5c4c05254ec4bce7 =20 install : $(TARGET) =20 diff --git a/make.sh b/make.sh index 47e1420d8..f26f713c8 100755 --- a/make.sh +++ b/make.sh @@ -871,6 +871,28 @@ update_language_list() { done | sort -u > "${path}/LINGUAS" } =20 +contributors() { + local commits name + + git shortlog --summary --numbered | while read -r commits name; do + echo "${name}" + done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Development$= " -e "@" -e "#$" +} + +update_contributors() { + echo -n "Updating list of contributors" + + local contributors=3D"$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g= ")" + + # Edit contributors into credits.cgi + awk -i inplace \ + "//{ p=3D1; print; printf \"${contributors}\n\"}//{ p=3D0 } !p" \ + "${BASEDIR}/html/cgi-bin/credits.cgi" + + print_status DONE + return 0 +} + # Load configuration file if [ -f .config ]; then . .config @@ -1864,8 +1886,11 @@ lang) update_language_list ${BASEDIR}/src/setup/po print_status DONE ;; +update-contributors) + update_contributors + ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|= toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|= toolchain|update-contributors}" cat doc/make.sh-usage ;; esac hooks/post-receive -- IPFire 2.x development tree --===============7518377292053656247==--