Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 7cda40251a2422917f43c44f148a01c50190744a..eb76de72eeb42835ef807cf4702f456962b9d600 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -59,7 +59,79 @@ print <<END
 <br><br>
 
 <p>
-       <strong>Core Developers:</strong>
+       <!-- CONTRIBUTORS -->
+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üller,
+Alf Høgemark,
+Ben Schweikert,
+Peter Pfeiffer,
+Daniel Glanzmann,
+Heiner Schmeling,
+Timo Eissler,
+Daniel Weismüller,
+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örn-Ingo Weigert,
+Kay-Michael Köhler,
+Kim Wölfel,
+Logan Schmidt,
+Nico Prenzel,
+Osmar Gonzalez,
+Paul T. Simmons,
+Robert Möker,
+Stefan Ernst,
+Stefan Ferstl,
+Thomas Ebert,
+Timmothy Wilson,
+Umberto Parma
+       <!-- END -->
 </p>
 
 <ul style="list-style: none">

diff --git a/lfs/nginx b/lfs/nginx
index 0fa6250f388312e0476b65aada795cb923147119..ecbe16221f2d0edd3af9a4a221068a6b24bc646e 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-14  IPFire Team  <info@ipfire.org>                       #
+# Copyright (C) 2007-18  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.13.7
+VER        = 1.15.1
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG      = nginx
-PAK_VER           = 7
+PAK_VER           = 8
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d
+$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9
 
 install : $(TARGET)
 
@@ -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=/usr/share/nginx/ \
+               --prefix=/usr/share/nginx \
                --conf-path=/etc/nginx/nginx.conf \
                --sbin-path=/usr/sbin/nginx \
                --pid-path=/var/run/nginx.pid \

diff --git a/lfs/rng-tools b/lfs/rng-tools
index f9b79d108d18e6c979fb3093509771063f679abb..c7a358e5640059d120bef1cfc6a3f1fd05102a21 100644 (file)
--- 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  <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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.2
+VER        = 6.3.1
 
 THISAPP    = rng-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a596ecd89afc584afe48758923fe6195
+$(DL_FILE)_MD5 = fe2d38e39ff02d0c7b3585407d51dc64
 
 install : $(TARGET)
 

diff --git a/lfs/tor b/lfs/tor
index c646e738d47309bc320bdf8283f74ab961fda993..dcb99adb52fc2c507df6be7d8e3d9968f95b640f 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.3.3.7
+VER        = 0.3.3.9
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 29
+PAK_VER    = 30
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5288d8de30c516073ad13fee44f6fdf3
+$(DL_FILE)_MD5 = 16b24bda0772dc3d5c4c05254ec4bce7
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 47e1420d881a802ba1c76ab03abef5a48f0d1581..f26f713c833fdb9d939c34dd20fafb6d7440d7de 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -871,6 +871,28 @@ update_language_list() {
        done | sort -u > "${path}/LINGUAS"
 }
 
+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="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")"
+
+       # Edit contributors into credits.cgi
+       awk -i inplace \
+               "/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !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