webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 20:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2018-08-05 17:19:36 +02:00
parent b403b04a13 4a50681905
commit 28b252145a
5 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
html/cgi-bin/credits.cgi
View File

@@ -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">

10
lfs/nginx
View File

@@ -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 \

6
lfs/rng-tools
View File

@@ -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)

6
lfs/tor
View File

@@ -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)

27
make.sh
View File

@@ -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