webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-03 18:41:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into kernel-4.14

Browse Source
This commit is contained in:
Arne Fitzenreiter
2018-01-15 19:08:23 +01:00
parent 5901793b61 cb7c10bd24
commit 2c21c4e522
73 changed files with 449 additions and 15232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/cdrom
View File

@@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog
ifneq "$(BUILD_PLATFORM)" "arm"
cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz
dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png
cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest
cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot

4
lfs/glib
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.32.3
VER = 2.54.3
THISAPP = glib-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9bd3ac535c24b6c162be13b2c43c5adc
$(DL_FILE)_MD5 = 16e886ad677bf07b7d48eb8188bcf759
install : $(TARGET)

4
lfs/gzip
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.8
VER = 1.9
THISAPP = gzip-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = f7caabb65cddc1a4165b398009bd05b9
$(DL_FILE)_MD5 = 9492c6ccb2239ff679a5475a7bb543ed
install : $(TARGET)

4
lfs/hdparm
View File

@@ -24,7 +24,7 @@
include Config
VER = 9.52
VER = 9.53
THISAPP = hdparm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 410539d0bf3cc247181594581edbfb53
$(DL_FILE)_MD5 = 1e54b52e0c8cb79389d4d47eacba411d
install : $(TARGET)

3
lfs/initscripts
View File

@@ -134,9 +134,6 @@ $(TARGET) :
ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random
ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random
ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
ln -sf ../init.d/mediatomb /etc/rc.d/rc3.d/S98mediatomb
ln -sf ../init.d/mediatomb /etc/rc.d/rc0.d/K02mediatomb
ln -sf ../init.d/mediatomb /etc/rc.d/rc6.d/K02mediatomb
ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175
ln -sf ../init.d/client175 /etc/rc.d/rc3.d/S66client175
ln -sf ../init.d/client175 /etc/rc.d/rc6.d/K34client175

2
lfs/linux-initrd
View File

@@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi"
ifneq "$(KCFG)" "-pae"
# Create initramfs images
dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
ifeq "$(KCFG)" "-kirkwood"
cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)

32
lfs/mediatomb → lfs/mdns-repeater
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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,17 +24,19 @@
include Config
VER = 0.12.1
VER = 1.10
THISAPP = mediatomb-$(VER)
THISAPP = mdns-repeater-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mediatomb
PAK_VER = 6
PROG = mdns-repeater
PAK_VER = 1
DEPS = "ffmpeg libexif taglib "
DEPS = ""
CFLAGS += -DHGVERSION='\"$(VER)\"'
###############################################################################
# Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e927dd5dc52d3cfcebd8ca1af6f0d3c2
$(DL_FILE)_MD5 = 6dba5f891b50c2267f45a7760894fcb6
install : $(TARGET)
@@ -76,18 +78,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
cp -Rvd $(DIR_SRC)/config/mediatomb /var/ipfire
chown -R nobody:nobody /var/ipfire/mediatomb
install -v -m 644 $(DIR_SRC)/config/backup/includes/mediatomb \
/var/ipfire/backup/addons/includes/mediatomb
echo Folder for music files > /var/mp3/info
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
cd $(DIR_APP) && install -v -m 755 mdns-repeater /usr/bin
#install initscripts
$(call INSTALL_INITSCRIPT,mediatomb)
# install initscripts
$(call INSTALL_INITSCRIPT,mdns-repeater)
@rm -rf $(DIR_APP)
@$(POSTBUILD)

102
lfs/owncloud
View File

@@ -1,102 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 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 = 7.0.11
THISAPP = owncloud-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = owncloud
PAK_VER = 7
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 1f4839e43bc910a9acd8700fb9923b3a
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/$(PROG) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC) && cp -vrf owncloud /srv/web/
# Rename files with spaces in the name.
while read -r file; do \
mv -v "$${file}" "$${file//\ /_}"; \
done <<< "$$(find /srv/web/owncloud | grep ' ')"
# Create data directory
mkdir -pv /var/owncloud/data
ln -s /var/owncloud/data /srv/web/owncloud/data
# Make sure everything is owned by root, except...
chown -R root.root /srv/web/owncloud
chown -R nobody.nobody /srv/web/owncloud/{apps,data,config}
install -v -m644 $(DIR_SRC)/config/owncloud/owncloud.conf \
/etc/httpd/conf/vhosts.d/
install -v -m 644 $(DIR_SRC)/config/backup/includes/owncloud \
/var/ipfire/backup/addons/includes/owncloud
@rm -rf $(DIR_SRC)/$(PROG)
@$(POSTBUILD)

140
lfs/php
View File

@@ -1,140 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 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 = 5.3.27
THISAPP = php-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(BUILD_PLATFORM)" "arm"
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
endif
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE) idn-0.1.tgz Log-1.9.11.tgz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml && \
cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc \
--with-apxs2 \
--enable-force-cgi-redirect \
--enable-discard-path \
--enable-fastcgi \
--with-config-file-path=/etc \
--with-openssl \
--with-kerberos \
--with-zlib \
--enable-bcmath \
--with-bz2 \
--enable-calendar \
--with-curl \
--with-curlwrappers \
--enable-dba=shared \
--with-gdbm \
--with-db4 \
--with-inifile \
--with-flatfile \
--enable-exif \
--enable-ftp \
--with-openssl-dir=/usr \
--with-gd=/usr \
--with-jpeg-dir=/usr \
--with-png-dir=/usr \
--with-zlib-dir=/usr \
--with-freetype-dir=/usr \
--with-gettext \
--with-gmp \
--enable-mbstring \
--with-mysql \
--with-mysql-sock=/var/run/mysql \
--with-ncurses \
--with-pdo-mysql \
--with-pdo-sqlite \
--with-readline \
--enable-sockets \
--with-xsl \
--with-iconv \
--enable-zip
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
-grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
-rm -f $(DIR_SRC)/package.xml
cd $(DIR_SRC)/idn-* && phpize
cd $(DIR_SRC)/idn-* && ./configure --prefix=/usr --with-idn
cd $(DIR_SRC)/idn-* && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/idn-* && make install
cd $(DIR_SRC) && tar xfz $(DIR_DL)/Log-1.9.11.tgz
-rm -f $(DIR_SRC)/package.xml
cd $(DIR_SRC)/Log-* && cp -av Log Log.php /usr/lib/php
@rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml
@$(POSTBUILD)

4
lfs/snort
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.9.11
VER = 2.9.11.1
THISAPP = snort-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4f3ee0c2ad330e487273016efd0c9d64
$(DL_FILE)_MD5 = 378e3938b2b5c8e358f942d0ffce18cc
install : $(TARGET)

8
lfs/tor
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# 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 = 0.3.1.9
VER = 0.3.2.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 = 25
PAK_VER = 26
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 585e62d086ae7df7cd873f735d726118
$(DL_FILE)_MD5 = 9aafe4d11464548346fdfb95a3eb9e83
install : $(TARGET)