mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
This commit is contained in:
Stefan Schantl
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 0.101.0
|
||||
VER = 0.101.1
|
||||
|
||||
THISAPP = clamav-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = clamav
|
||||
PAK_VER = 42
|
||||
PAK_VER = 43
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 47c36d13ac814b9e29ed6f5fc1691373
|
||||
$(DL_FILE)_MD5 = 9c137d6172f6e132e08e61fe25b636f8
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ $(TARGET) :
|
||||
|
||||
# Touch empty files
|
||||
for i in auth/users backup/include.user backup/exclude.user \
|
||||
captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt ddns/config ddns/settings ddns/ipcache dhcp/settings \
|
||||
captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
|
||||
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
|
||||
ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
|
||||
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
|
||||
@@ -99,7 +99,6 @@ $(TARGET) :
|
||||
cp $(DIR_SRC)/config/cfgroot/ssh-settings $(CONFIG_ROOT)/remote/settings
|
||||
cp $(DIR_SRC)/config/cfgroot/time-settings $(CONFIG_ROOT)/time/settings
|
||||
cp $(DIR_SRC)/config/cfgroot/logging-settings $(CONFIG_ROOT)/logging/settings
|
||||
cp $(DIR_SRC)/config/cfgroot/useragents $(CONFIG_ROOT)/proxy/advanced
|
||||
cp $(DIR_SRC)/config/cfgroot/ethernet-vlans $(CONFIG_ROOT)/ethernet/vlans
|
||||
cp $(DIR_SRC)/langs/list $(CONFIG_ROOT)/langs/
|
||||
cp $(DIR_SRC)/config/firewall/convert-xtaccess /usr/sbin/convert-xtaccess
|
||||
|
||||
@@ -155,6 +155,9 @@ $(TARGET) :
|
||||
ln -sf ../init.d/leds /etc/rc.d/rc3.d/S21leds
|
||||
ln -sf ../init.d/leds /etc/rc.d/rc6.d/K79leds
|
||||
ln -sf ../init.d/fireinfo /etc/rc.d/rc3.d/S15fireinfo
|
||||
ln -sf ../init.d/conntrackd /etc/rc.d/rc0.d/K77conntrackd
|
||||
ln -sf ../init.d/conntrackd /etc/rc.d/rc3.d/S22conntrackd
|
||||
ln -sf ../init.d/conntrackd /etc/rc.d/rc6.d/K77conntrackd
|
||||
ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
|
||||
ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S01sysctl
|
||||
ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules
|
||||
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = keepalived
|
||||
PAK_VER = 4
|
||||
PAK_VER = 5
|
||||
|
||||
DEPS = ""
|
||||
|
||||
|
||||
@@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
SUP_ARCH = i586 x86_64
|
||||
PROG = libvirt
|
||||
PAK_VER = 17
|
||||
PAK_VER = 19
|
||||
|
||||
DEPS = "jansson libpciaccess libyajl ncat qemu"
|
||||
DEPS = "libpciaccess libyajl ncat qemu"
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
|
||||
@@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
CFLAGS =
|
||||
CXXFLAGS =
|
||||
|
||||
PAK_VER = 79
|
||||
PAK_VER = 80
|
||||
DEPS = ""
|
||||
|
||||
HEADERS_ARCH = $(BUILD_PLATFORM)
|
||||
@@ -211,14 +211,14 @@ ifeq "$(LASTKERNEL)" "1"
|
||||
echo install drm /bin/false > /etc/modprobe.d/framebuffer.conf
|
||||
|
||||
# Blacklist old framebuffer modules
|
||||
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \
|
||||
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko.xz); do \
|
||||
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
|
||||
done
|
||||
# Blacklist new drm framebuffer modules
|
||||
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \
|
||||
for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko.xz); do \
|
||||
echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
|
||||
done
|
||||
sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
|
||||
sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf
|
||||
|
||||
# Disable ipv6 at runtime
|
||||
echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf
|
||||
|
||||
@@ -71,13 +71,13 @@ ifeq "$(KCFG)" "-kirkwood"
|
||||
endif
|
||||
|
||||
ifeq "$(KCFG)" "-multi"
|
||||
ifeq "$(BUILD_ARCH)" "aarch64"
|
||||
cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
|
||||
# dont remove initramfs because grub need this to boot.
|
||||
else
|
||||
cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
|
||||
cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img
|
||||
endif
|
||||
|
||||
ifeq "$(BUILD_ARCH)" "aarch64"
|
||||
cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX)
|
||||
# dont remove initramfs because grub need this to boot.
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 3.14.0
|
||||
VER = 3.15.0
|
||||
|
||||
THISAPP = logrotate-$(VER)
|
||||
DL_FILE = logrotate-$(VER).tar.gz
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 9d9cf1d0a0b0433f56e152c5117f7b31
|
||||
$(DL_FILE)_MD5 = 240105d3288657d0ad7782c6a34c9a85
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
6
lfs/mc
6
lfs/mc
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 4.8.20
|
||||
VER = 4.8.22
|
||||
|
||||
THISAPP = mc-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = mc
|
||||
PAK_VER = 16
|
||||
PAK_VER = 17
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 7f808b01f3f7d9aa52152a9efb86dbca
|
||||
$(DL_FILE)_MD5 = 62bba2bfccadf08eb554321899f475bc
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
2
lfs/mpd
2
lfs/mpd
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = mpd
|
||||
PAK_VER = 19
|
||||
|
||||
DEPS = "alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus"
|
||||
DEPS = "alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr"
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
|
||||
10
lfs/openssl
10
lfs/openssl
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2019 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.1.0j
|
||||
VER = 1.1.1a
|
||||
|
||||
THISAPP = openssl-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -48,13 +48,13 @@ CONFIGURE_OPTIONS = \
|
||||
shared \
|
||||
zlib-dynamic \
|
||||
enable-camellia \
|
||||
enable-md2 \
|
||||
enable-seed \
|
||||
enable-rfc3779 \
|
||||
no-idea \
|
||||
no-mdc2 \
|
||||
no-rc5 \
|
||||
no-srp \
|
||||
no-aria \
|
||||
$(OPENSSL_ARCH)
|
||||
|
||||
ifeq "$(IS_64BIT)" "1"
|
||||
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = b4ca5b78ae6ae79da80790b30dbedbdc
|
||||
$(DL_FILE)_MD5 = 963deb2272d6be7d4c2458afd2517b73
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -117,7 +117,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0g-weak-ciphers.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.1a-default-cipherlist.patch
|
||||
|
||||
# Apply our CFLAGS
|
||||
cd $(DIR_APP) && sed -i Configure \
|
||||
|
||||
@@ -24,57 +24,13 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1.0.2q
|
||||
VER = 0.21
|
||||
|
||||
THISAPP = openssl-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
THISAPP = Net-CIDR-Lite-$(VER)
|
||||
DL_FILE = ${THISAPP}.tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
|
||||
|
||||
export RPM_OPT_FLAGS = $(CFLAGS)
|
||||
|
||||
CONFIGURE_OPTIONS = \
|
||||
--prefix=/usr \
|
||||
--openssldir=/etc/ssl \
|
||||
--enginesdir=/usr/lib/openssl/engines \
|
||||
shared \
|
||||
zlib-dynamic \
|
||||
enable-camellia \
|
||||
enable-md2 \
|
||||
disable-ssl2 \
|
||||
enable-seed \
|
||||
enable-tlsext \
|
||||
enable-rfc3779 \
|
||||
no-idea \
|
||||
no-mdc2 \
|
||||
no-rc5 \
|
||||
no-srp \
|
||||
-DSSL_FORBID_ENULL \
|
||||
$(OPENSSL_ARCH)
|
||||
|
||||
ifeq "$(IS_64BIT)" "1"
|
||||
OPENSSL_ARCH = linux-generic64
|
||||
else
|
||||
OPENSSL_ARCH = linux-generic32
|
||||
endif
|
||||
|
||||
ifeq "$(BUILD_ARCH)" "aarch64"
|
||||
OPENSSL_ARCH = linux-aarch64
|
||||
endif
|
||||
|
||||
ifeq "$(BUILD_ARCH)" "x86_64"
|
||||
OPENSSL_ARCH = linux-x86_64
|
||||
endif
|
||||
|
||||
ifeq "$(BUILD_ARCH)" "i586"
|
||||
OPENSSL_ARCH = linux-elf
|
||||
|
||||
ifneq "$(KCFG)" "-sse2"
|
||||
OPENSSL_ARCH += no-sse2
|
||||
endif
|
||||
endif
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
@@ -84,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 7563e1ce046cb21948eeb6ba1a0eb71c
|
||||
$(DL_FILE)_MD5 = 12280b3754886b876918f03f53aee4f5
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -94,6 +50,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
dist:
|
||||
@$(PAK)
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
@@ -114,35 +73,8 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.0-beta5-enginesdir.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a-rpmbuild.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2h-weak-ciphers.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2g-disable-sslv2v3.patch
|
||||
|
||||
# i586 specific patches
|
||||
ifeq "$(BUILD_ARCH)" "i586"
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch
|
||||
endif
|
||||
|
||||
# With openssl 1.0.2e, pod2mantest is missing
|
||||
echo -e "#!/bin/bash\necho \$$(which pod2man)" > $(DIR_APP)/util/pod2mantest
|
||||
chmod a+x $(DIR_APP)/util/pod2mantest
|
||||
|
||||
# Apply our CFLAGS
|
||||
cd $(DIR_APP) && sed -i Configure \
|
||||
-e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"
|
||||
|
||||
cd $(DIR_APP) && find crypto/ -name Makefile -exec \
|
||||
sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \;
|
||||
|
||||
cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS)
|
||||
|
||||
cd $(DIR_APP) && make depend
|
||||
cd $(DIR_APP) && make
|
||||
|
||||
# Install libraries only
|
||||
cd $(DIR_APP) && install -m 755 \
|
||||
libcrypto.so.10 libssl.so.10 /usr/lib
|
||||
|
||||
cd $(DIR_APP) && perl Makefile.PL
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2019 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,9 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.7.13
|
||||
# If you update this make sure that you also change the VER and PAK_VER of
|
||||
# python-optional-src !
|
||||
VER = 2.7.15
|
||||
|
||||
THISAPP = Python-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 53b43534153bb2a0363f08bae8b9d990
|
||||
$(DL_FILE)_MD5 = a80ae3cc478460b922242f43a1b4094d
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -71,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
|
||||
rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch
|
||||
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
|
||||
--prefix=/usr \
|
||||
--enable-shared \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2019 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,12 +24,12 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.7.10
|
||||
VER = 2.7.15
|
||||
|
||||
include python
|
||||
|
||||
PROG = python-optional-src
|
||||
PAK_VER = 4
|
||||
PAK_VER = 5
|
||||
DEPS =
|
||||
|
||||
dist:
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 4.4
|
||||
VER = 4.5
|
||||
|
||||
THISAPP = squid-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 892504ca9700e1f139a53f84098613bd
|
||||
$(DL_FILE)_MD5 = 8275da5846f9f2243ad2625e5aef2ee0
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -72,10 +72,7 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/01_Fix_netdb_exchange_with_a_TLS_cache_peer_307.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/02_Maintenance_add_xz_tarball_format_formally_to_make_dist_325.patch
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/03_The_handshake_logformat_code_331.patch
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.4-fix-max-file-descriptors.patch
|
||||
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch
|
||||
|
||||
cd $(DIR_APP) && autoreconf -vfi
|
||||
cd $(DIR_APP)/libltdl && autoreconf -vfi
|
||||
|
||||
7
lfs/tar
7
lfs/tar
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1.30
|
||||
VER = 1.31
|
||||
|
||||
THISAPP = tar-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 8404e4c1fc5a3000228ab2b8ad674a65
|
||||
$(DL_FILE)_MD5 = 77afa35b696c8d760331fa0e12c2fac9
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -80,6 +80,9 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
|
||||
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/tar/01_extract.c.patch
|
||||
|
||||
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) FORCE_UNSAFE_CONFIGURE=1
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2019 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 = 2.92
|
||||
VER = 2.94
|
||||
|
||||
THISAPP = transmission-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = transmission
|
||||
PAK_VER = 15
|
||||
PAK_VER = 16
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 3fce404a436e3cd7fde80fb6ed61c264
|
||||
$(DL_FILE)_MD5 = c92829294edfa391c046407eeb16358a
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -79,7 +79,6 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/transmission-2.92-openssl-1.1.0.patch
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
4
lfs/wget
4
lfs/wget
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 1.20
|
||||
VER = 1.20.1
|
||||
|
||||
THISAPP = wget-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 9f1515d083b769e9ff7642ce6016518e
|
||||
$(DL_FILE)_MD5 = f6ebe9c7b375fc9832fb1b2028271fb7
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ include Config
|
||||
VERSUFIX = ipfire$(KCFG)
|
||||
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/
|
||||
|
||||
VER = 2.13
|
||||
VER = 3.2
|
||||
|
||||
THISAPP = xtables-addons-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.xz
|
||||
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = be20b0b9c4b001b364431a836e361d33
|
||||
$(DL_FILE)_MD5 = 80ea89ba8d5a001a8d71c7f05b2f0141
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -94,6 +94,10 @@ ifeq "$(USPACE)" "1"
|
||||
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
|
||||
# Install xt_geoip_build.
|
||||
cd $(DIR_APP) && install -m 755 geoip/xt_geoip_build \
|
||||
/usr/local/bin/
|
||||
else
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--with-kbuild=/usr/src/linux-$(KVER)/
|
||||
|
||||
Reference in New Issue
Block a user