webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 17:32:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stefan Schantl
2019-02-08 09:59:31 +01:00
parent f3cbcfeff9 02a8a241bb
commit c1c754a121
39 changed files with 982 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/kernel/kernel.config.aarch64-ipfire
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.94-ipfire Kernel Configuration
# Linux/arm64 4.14.97-ipfire Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -6292,7 +6292,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_ACL=y

4
config/kernel/kernel.config.armv5tel-ipfire-kirkwood
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.94-ipfire-kirkwood Kernel Configuration
# Linux/arm 4.14.97-ipfire-kirkwood Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -5719,7 +5719,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_ACL=y

4
config/kernel/kernel.config.armv5tel-ipfire-multi
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.94-ipfire-multi Kernel Configuration
# Linux/arm 4.14.97-ipfire-multi Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6782,7 +6782,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_ACL=y

4
config/kernel/kernel.config.i586-ipfire
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.94-ipfire-pae Kernel Configuration
# Linux/x86 4.14.97-ipfire-pae Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -6411,7 +6411,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_ACL=y

4
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.94-ipfire-pae Kernel Configuration
# Linux/x86 4.14.97-ipfire-pae Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -6417,7 +6417,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_ACL=y

4
config/kernel/kernel.config.x86_64-ipfire
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.94-ipfire Kernel Configuration
# Linux/x86 4.14.97-ipfire Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -6271,7 +6271,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_ACL=y

2
config/ovpn/openssl/ovpn.cnf
View File

@@ -1,5 +1,4 @@
HOME = .
RANDFILE = /var/ipfire/ovpn/ca/.rnd
oid_section = new_oids
[ new_oids ]
@@ -17,7 +16,6 @@ certificate = $dir/ca/cacert.pem
serial = $dir/certs/serial
crl = $dir/crl.pem
private_key = $dir/ca/cakey.pem
RANDFILE = $dir/ca/.rand
x509_extensions = usr_cert
default_days = 999999
default_crl_days = 30

452
config/rootfiles/common/apache2
View File

File diff suppressed because it is too large Load Diff

2
config/rootfiles/common/apr
View File

@@ -44,7 +44,7 @@ usr/bin/apr-1-config
#usr/lib/libapr-1.la
#usr/lib/libapr-1.so
usr/lib/libapr-1.so.0
usr/lib/libapr-1.so.0.6.3
usr/lib/libapr-1.so.0.6.5
#usr/lib/pkgconfig/apr-1.pc
#usr/share/apr-1
#usr/share/apr-1/build

24
config/rootfiles/common/curl
View File

@@ -9,6 +9,7 @@ usr/bin/curl
#usr/include/curl/stdcheaders.h
#usr/include/curl/system.h
#usr/include/curl/typecheck-gcc.h
#usr/include/curl/urlapi.h
#usr/lib/libcurl.la
#usr/lib/libcurl.so
usr/lib/libcurl.so.4
@@ -19,9 +20,11 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man1/curl.1
#usr/share/man/man3/CURLINFO_ACTIVESOCKET.3
#usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3
#usr/share/man/man3/CURLINFO_APPCONNECT_TIME_T.3
#usr/share/man/man3/CURLINFO_CERTINFO.3
#usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
#usr/share/man/man3/CURLINFO_CONNECT_TIME.3
#usr/share/man/man3/CURLINFO_CONNECT_TIME_T.3
#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
@@ -40,9 +43,11 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLINFO_LOCAL_IP.3
#usr/share/man/man3/CURLINFO_LOCAL_PORT.3
#usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3
#usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME_T.3
#usr/share/man/man3/CURLINFO_NUM_CONNECTS.3
#usr/share/man/man3/CURLINFO_OS_ERRNO.3
#usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3
#usr/share/man/man3/CURLINFO_PRETRANSFER_TIME_T.3
#usr/share/man/man3/CURLINFO_PRIMARY_IP.3
#usr/share/man/man3/CURLINFO_PRIMARY_PORT.3
#usr/share/man/man3/CURLINFO_PRIVATE.3
@@ -51,6 +56,7 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
#usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
#usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
#usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.3
#usr/share/man/man3/CURLINFO_REDIRECT_URL.3
#usr/share/man/man3/CURLINFO_REQUEST_SIZE.3
#usr/share/man/man3/CURLINFO_RESPONSE_CODE.3
@@ -70,9 +76,11 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLINFO_SSL_ENGINES.3
#usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
#usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
#usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME_T.3
#usr/share/man/man3/CURLINFO_TLS_SESSION.3
#usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3
#usr/share/man/man3/CURLINFO_TOTAL_TIME.3
#usr/share/man/man3/CURLINFO_TOTAL_TIME_T.3
#usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
#usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
#usr/share/man/man3/CURLMOPT_MAXCONNECTS.3
@@ -118,17 +126,21 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3
#usr/share/man/man3/CURLOPT_CRLF.3
#usr/share/man/man3/CURLOPT_CRLFILE.3
#usr/share/man/man3/CURLOPT_CURLU.3
#usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3
#usr/share/man/man3/CURLOPT_DEBUGDATA.3
#usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3
#usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3
#usr/share/man/man3/CURLOPT_DIRLISTONLY.3
#usr/share/man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3
#usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
#usr/share/man/man3/CURLOPT_DNS_INTERFACE.3
#usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3
#usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3
#usr/share/man/man3/CURLOPT_DNS_SERVERS.3
#usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3
#usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3
#usr/share/man/man3/CURLOPT_DOH_URL.3
#usr/share/man/man3/CURLOPT_EGDSOCKET.3
#usr/share/man/man3/CURLOPT_ERRORBUFFER.3
#usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3
@@ -153,6 +165,7 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLOPT_FTP_USE_PRET.3
#usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3
#usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
#usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3
#usr/share/man/man3/CURLOPT_HEADER.3
#usr/share/man/man3/CURLOPT_HEADERDATA.3
#usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
@@ -244,6 +257,7 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3
#usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3
#usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3
#usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3
#usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3
#usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3
#usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3
@@ -322,6 +336,7 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
#usr/share/man/man3/CURLOPT_TIMEVALUE.3
#usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3
#usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3
#usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
#usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
#usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
@@ -329,7 +344,9 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3
#usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3
#usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3
#usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3
#usr/share/man/man3/CURLOPT_UPLOAD.3
#usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3
#usr/share/man/man3/CURLOPT_URL.3
#usr/share/man/man3/CURLOPT_USERAGENT.3
#usr/share/man/man3/CURLOPT_USERNAME.3
@@ -355,6 +372,7 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/curl_easy_setopt.3
#usr/share/man/man3/curl_easy_strerror.3
#usr/share/man/man3/curl_easy_unescape.3
#usr/share/man/man3/curl_easy_upkeep.3
#usr/share/man/man3/curl_escape.3
#usr/share/man/man3/curl_formadd.3
#usr/share/man/man3/curl_formfree.3
@@ -403,6 +421,11 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/curl_strequal.3
#usr/share/man/man3/curl_strnequal.3
#usr/share/man/man3/curl_unescape.3
#usr/share/man/man3/curl_url.3
#usr/share/man/man3/curl_url_cleanup.3
#usr/share/man/man3/curl_url_dup.3
#usr/share/man/man3/curl_url_get.3
#usr/share/man/man3/curl_url_set.3
#usr/share/man/man3/curl_version.3
#usr/share/man/man3/curl_version_info.3
#usr/share/man/man3/libcurl-easy.3
@@ -414,4 +437,5 @@ usr/lib/libcurl.so.4.5.0
#usr/share/man/man3/libcurl-symbols.3
#usr/share/man/man3/libcurl-thread.3
#usr/share/man/man3/libcurl-tutorial.3
#usr/share/man/man3/libcurl-url.3
#usr/share/man/man3/libcurl.3

60
config/rootfiles/common/python3-setuptools Normal file
View File

@@ -0,0 +1,60 @@
#usr/lib/python3.6/site-packages/pkg_resources/__pycache__/py31compat.cpython-36.pyc
#usr/lib/python3.6/site-packages/pkg_resources/py31compat.py
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/PKG-INFO
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/SOURCES.txt
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/dependency_links.txt
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/entry_points.txt
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/requires.txt
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/top_level.txt
#usr/lib/python3.6/site-packages/setuptools-40.6.3-py3.6.egg-info/zip-safe
#usr/lib/python3.6/site-packages/setuptools/__pycache__/_deprecation_warning.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/build_meta.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/config.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/dep_util.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/glibc.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/pep425tags.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/py33compat.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/py36compat.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/__pycache__/wheel.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_deprecation_warning.py
#usr/lib/python3.6/site-packages/setuptools/_vendor
#usr/lib/python3.6/site-packages/setuptools/_vendor/__init__.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__
#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/__init__.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/pyparsing.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/__pycache__/six.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__about__.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__init__.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/__about__.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/_compat.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/_compat.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/_structures.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/markers.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/requirements.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/specifiers.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/utils.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/packaging/version.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/pyparsing.py
#usr/lib/python3.6/site-packages/setuptools/_vendor/six.py
#usr/lib/python3.6/site-packages/setuptools/build_meta.py
#usr/lib/python3.6/site-packages/setuptools/command/__pycache__/build_clib.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/command/__pycache__/dist_info.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools/command/build_clib.py
#usr/lib/python3.6/site-packages/setuptools/command/dist_info.py
#usr/lib/python3.6/site-packages/setuptools/config.py
#usr/lib/python3.6/site-packages/setuptools/dep_util.py
#usr/lib/python3.6/site-packages/setuptools/glibc.py
#usr/lib/python3.6/site-packages/setuptools/pep425tags.py
#usr/lib/python3.6/site-packages/setuptools/py33compat.py
#usr/lib/python3.6/site-packages/setuptools/py36compat.py
#usr/lib/python3.6/site-packages/setuptools/wheel.py

37
config/rootfiles/common/python3-setuptools-scm Normal file
View File

@@ -0,0 +1,37 @@
#usr/lib/python3.6/site-packages/setuptools_scm
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/PKG-INFO
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/SOURCES.txt
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/dependency_links.txt
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/entry_points.txt
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/top_level.txt
#usr/lib/python3.6/site-packages/setuptools_scm-3.2.0-py3.6.egg-info/zip-safe
#usr/lib/python3.6/site-packages/setuptools_scm/__init__.py
#usr/lib/python3.6/site-packages/setuptools_scm/__main__.py
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/__init__.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/__main__.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/config.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/discover.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder_git.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/file_finder_hg.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/git.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/hacks.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/hg.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/integration.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/utils.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/version.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/__pycache__/win_py31_compat.cpython-36.pyc
#usr/lib/python3.6/site-packages/setuptools_scm/config.py
#usr/lib/python3.6/site-packages/setuptools_scm/discover.py
#usr/lib/python3.6/site-packages/setuptools_scm/file_finder.py
#usr/lib/python3.6/site-packages/setuptools_scm/file_finder_git.py
#usr/lib/python3.6/site-packages/setuptools_scm/file_finder_hg.py
#usr/lib/python3.6/site-packages/setuptools_scm/git.py
#usr/lib/python3.6/site-packages/setuptools_scm/hacks.py
#usr/lib/python3.6/site-packages/setuptools_scm/hg.py
#usr/lib/python3.6/site-packages/setuptools_scm/integration.py
#usr/lib/python3.6/site-packages/setuptools_scm/utils.py
#usr/lib/python3.6/site-packages/setuptools_scm/version.py
#usr/lib/python3.6/site-packages/setuptools_scm/win_py31_compat.py

1
config/rootfiles/core/128/exclude
View File

@@ -11,7 +11,6 @@ etc/ipsec.user.secrets
etc/localtime
etc/shadow
etc/snort/snort.conf
etc/ssl/openssl.cnf
etc/sudoers
etc/sysconfig/firewall.local
etc/sysconfig/rc.local

1
config/rootfiles/core/128/filelists/apr Symbolic link
View File

@@ -0,0 +1 @@
../../../common/apr

1
config/rootfiles/core/128/filelists/curl Symbolic link
View File

@@ -0,0 +1 @@
../../../common/curl

1
config/rootfiles/core/128/filelists/dhcpcd Symbolic link
View File

@@ -0,0 +1 @@
../../../common/dhcpcd

5
config/rootfiles/core/128/filelists/files
View File

@@ -2,6 +2,11 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
etc/rc.d/helper/aws-setup
etc/rc.d/init.d/aws
etc/rc.d/init.d/firewall
etc/ssl/openssl.cnf
etc/sysctl.conf
srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/xt_geoip_update
var/ipfire/ovpn/openssl/ovpn.cnf

14
config/rootfiles/core/128/update.sh
View File

@@ -35,8 +35,14 @@ done
# Remove files
rm -vf \
/usr/lib/libcrypto.so.10 \
/usr/lib/libssl.so.10
/usr/lib{,/sse2}/libcrypto.so.10 \
/usr/lib{,/sse2}/libssl.so.10 \
/home/nobody/.rnd \
/var/ipfire/ovpn/ca/.rnd \
/var/tmp/.rnd \
/.rnd \
/root/.rnd
# Extract files
extract_files
@@ -55,6 +61,10 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/init.d/ipsec restart
fi
/etc/init.d/sshd restart
/etc/init.d/apache restart
# This update needs a reboot...
touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start

109
config/rootfiles/packages/borgbackup Normal file
View File

@@ -0,0 +1,109 @@
usr/bin/borg
usr/lib/python3.6/site-packages/borg
usr/lib/python3.6/site-packages/borg/__init__.py
usr/lib/python3.6/site-packages/borg/__main__.py
usr/lib/python3.6/site-packages/borg/__pycache__
usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc
usr/lib/python3.6/site-packages/borg/_chunker.c
usr/lib/python3.6/site-packages/borg/_hashindex.c
usr/lib/python3.6/site-packages/borg/_version.py
usr/lib/python3.6/site-packages/borg/archive.py
usr/lib/python3.6/site-packages/borg/archiver.py
usr/lib/python3.6/site-packages/borg/cache.py
usr/lib/python3.6/site-packages/borg/chunker.c
usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/borg/chunker.pyx
usr/lib/python3.6/site-packages/borg/compress.c
usr/lib/python3.6/site-packages/borg/compress.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/borg/compress.pyx
usr/lib/python3.6/site-packages/borg/crypto.c
usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/borg/crypto.pyx
usr/lib/python3.6/site-packages/borg/fuse.py
usr/lib/python3.6/site-packages/borg/hashindex.c
usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/borg/hashindex.pyx
usr/lib/python3.6/site-packages/borg/helpers.py
usr/lib/python3.6/site-packages/borg/key.py
usr/lib/python3.6/site-packages/borg/keymanager.py
usr/lib/python3.6/site-packages/borg/locking.py
usr/lib/python3.6/site-packages/borg/logger.py
usr/lib/python3.6/site-packages/borg/lrucache.py
usr/lib/python3.6/site-packages/borg/paperkey.html
usr/lib/python3.6/site-packages/borg/platform.py
usr/lib/python3.6/site-packages/borg/platform_darwin.c
usr/lib/python3.6/site-packages/borg/platform_darwin.pyx
usr/lib/python3.6/site-packages/borg/platform_freebsd.c
usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx
usr/lib/python3.6/site-packages/borg/platform_linux.c
usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/borg/platform_linux.pyx
usr/lib/python3.6/site-packages/borg/remote.py
usr/lib/python3.6/site-packages/borg/repository.py
usr/lib/python3.6/site-packages/borg/shellpattern.py
#usr/lib/python3.6/site-packages/borg/testsuite
#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc
#usr/lib/python3.6/site-packages/borg/testsuite/archive.py
#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py
#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz
#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py
#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py
#usr/lib/python3.6/site-packages/borg/testsuite/compress.py
#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py
#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py
#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py
#usr/lib/python3.6/site-packages/borg/testsuite/key.py
#usr/lib/python3.6/site-packages/borg/testsuite/locking.py
#usr/lib/python3.6/site-packages/borg/testsuite/logger.py
#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py
#usr/lib/python3.6/site-packages/borg/testsuite/platform.py
#usr/lib/python3.6/site-packages/borg/testsuite/repository.py
#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py
#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py
#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py
usr/lib/python3.6/site-packages/borg/upgrader.py
usr/lib/python3.6/site-packages/borg/xattr.py
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt
usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt

17
config/rootfiles/packages/i586/python3-msgpack Normal file
View File

@@ -0,0 +1,17 @@
#usr/lib/python3.6/site-packages/msgpack
usr/lib/python3.6/site-packages/msgpack/__init__.py
usr/lib/python3.6/site-packages/msgpack/__pycache__
usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-i386-linux-gnu.so
usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-i386-linux-gnu.so
usr/lib/python3.6/site-packages/msgpack/_version.py
usr/lib/python3.6/site-packages/msgpack/exceptions.py
usr/lib/python3.6/site-packages/msgpack/fallback.py
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt

14
config/rootfiles/packages/python3-dateutil
View File

@@ -43,10 +43,10 @@ usr/lib/python3.6/site-packages/dateutil
#usr/lib/python3.6/site-packages/dateutil/zoneinfo/__pycache__/rebuild.cpython-36.pyc
#usr/lib/python3.6/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
#usr/lib/python3.6/site-packages/dateutil/zoneinfo/rebuild.py
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/PKG-INFO
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/SOURCES.txt
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/dependency_links.txt
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/requires.txt
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/top_level.txt
#usr/lib/python3.6/site-packages/python_dateutil-0.0.0-py3.6.egg-info/zip-safe
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/PKG-INFO
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/SOURCES.txt
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/dependency_links.txt
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/requires.txt
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/top_level.txt
#usr/lib/python3.6/site-packages/python_dateutil-2.7.3-py3.6.egg-info/zip-safe

7
config/rootfiles/packages/python3-llfuse Normal file
View File

@@ -0,0 +1,7 @@
usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info
usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO
usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt
usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt
usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt
usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe
usr/lib/python3.6/site-packages/llfuse.cpython-36m-MACHINE-linux-gnu.so

17
config/rootfiles/packages/python3-msgpack Normal file
View File

@@ -0,0 +1,17 @@
#usr/lib/python3.6/site-packages/msgpack
usr/lib/python3.6/site-packages/msgpack/__init__.py
usr/lib/python3.6/site-packages/msgpack/__pycache__
usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-MACHINE-linux-gnu.so
usr/lib/python3.6/site-packages/msgpack/_version.py
usr/lib/python3.6/site-packages/msgpack/exceptions.py
usr/lib/python3.6/site-packages/msgpack/fallback.py
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt

3
config/rootfiles/packages/tor
View File

@@ -8,15 +8,18 @@ etc/tor/torrc
srv/web/ipfire/cgi-bin/tor.cgi
usr/bin/tor
usr/bin/tor-gencert
usr/bin/tor-print-ed-signing-cert
usr/bin/tor-resolve
#usr/bin/torify
usr/local/bin/torctrl
#usr/share/doc/tor
#usr/share/doc/tor/tor-gencert.html
#usr/share/doc/tor/tor-print-ed-signing-cert.html
#usr/share/doc/tor/tor-resolve.html
#usr/share/doc/tor/tor.html
#usr/share/doc/tor/torify.html
#usr/share/man/man1/tor-gencert.1
#usr/share/man/man1/tor-print-ed-signing-cert.1
#usr/share/man/man1/tor-resolve.1
#usr/share/man/man1/tor.1
#usr/share/man/man1/torify.1

2
config/ssl/openssl.cnf
View File

@@ -1,5 +1,4 @@
HOME = .
RANDFILE = /var/tmp/.rnd
oid_section = new_oids
[ new_oids ]
@@ -17,7 +16,6 @@ certificate = $dir/ca/cacert.pem
serial = $dir/certs/serial
crl = $dir/crls/cacrl.pem
private_key = $dir/private/cakey.pem
RANDFILE = $dir/tmp/.rand
x509_extensions = usr_cert
default_days = 999999
default_crl_days= 30

6
lfs/apache2
View File

@@ -25,7 +25,7 @@
include Config
VER = 2.4.35
VER = 2.4.38
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 30c1cde80ffe814a8d16b4fdffda330a
$(DL_FILE)_MD5 = 4a2b87ca55e42017d21f18724c560084
install : $(TARGET)
@@ -101,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
echo "</Layout>" >> $(DIR_APP)/config.layout
cd $(DIR_APP) && ./configure --enable-layout=IPFire \
--enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event
--enable-ssl --enable-mods-shared=all --enable-proxy --with-mpm=event --disable-lua --disable-md
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
chown -v root:root /usr/lib/apache/httpd.exp \

4
lfs/apr
View File

@@ -25,7 +25,7 @@
include Config
VER = 1.6.3
VER = 1.6.5
THISAPP = apr-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa
$(DL_FILE)_MD5 = ad4add8efdfe87330b88e5e788241775
install : $(TARGET)

83
lfs/borgbackup Normal file
View File

@@ -0,0 +1,83 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# 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 #
# 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 = 1.0.12
THISAPP = borgbackup-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = borgbackup
PAK_VER = 1
DEPS = "python3 python3-llfuse python3-msgpack"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7bd9fa82a517d559d56a4e1ff5965bc8
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_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && python3 setup.py build
cd $(DIR_APP) && python3 setup.py install --root=/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/curl
View File

@@ -24,7 +24,7 @@
include Config
VER = 7.59.0
VER = 7.63.0
THISAPP = curl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a44f98c25c7506e7103039b542aa5ad8
$(DL_FILE)_MD5 = 6121427a7199cd6094fc48c9e31e8992
install : $(TARGET)

4
lfs/dhcpcd
View File

@@ -24,7 +24,7 @@
include Config
VER = 7.0.8
VER = 7.1.0
THISAPP = dhcpcd-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 77bbb1d73b6f30d6ddcc8b0fd3eae266
$(DL_FILE)_MD5 = 918520b171f32f0da97316f3bcf3edc1
install : $(TARGET)

2
lfs/haproxy
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = haproxy
PAK_VER = 8
PAK_VER = 9
DEPS = ""

8
lfs/linux
View File

@@ -24,8 +24,8 @@
include Config
VER = 4.14.95
ARM_PATCHES = 4.14.95-ipfire0
VER = 4.14.97
ARM_PATCHES = 4.14.97-ipfire0
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -82,8 +82,8 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
$(DL_FILE)_MD5 = 581f25286b695c77c7fc20711f2d3c89
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 1b7d72e71b8923d39eb2fede46c66d0c
$(DL_FILE)_MD5 = 14dc56d3933045782caca454d32e8874
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = b2f6559b08f764c0d974e860660d416a
install : $(TARGET)

83
lfs/python3-llfuse Normal file
View File

@@ -0,0 +1,83 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# 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 #
# 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 = 1.3.5
THISAPP = llfuse-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-llfuse
PAK_VER = 1
DEPS = "python3"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9fbb82c0db909d139f9fafa27c76781e
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_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && python3 setup.py build
cd $(DIR_APP) && python3 setup.py install --root=/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

83
lfs/python3-msgpack Normal file
View File

@@ -0,0 +1,83 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# 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 #
# 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 = 0.5.6
THISAPP = msgpack-python-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-msgpack
PAK_VER = 1
DEPS = "python3"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6d644c06a87a5a111bbbf5b34b4be440
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_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && python3 setup.py build
cd $(DIR_APP) && python3 setup.py install --root=/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

85
lfs/python3-setuptools Normal file
View File

@@ -0,0 +1,85 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# 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 #
# 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 = 40.6.3
THISAPP = setuptools-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-setuptools
PAK_VER = 1
DEPS = "python3"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 425b58efe131537abde25c1b5624527a
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_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -e '/tag_build = .post/d' -e '/tag_date = 1/d' -i setup.cfg
cd $(DIR_APP) && python3 bootstrap.py
cd $(DIR_APP) && python3 setup.py build
cd $(DIR_APP) && python3 setup.py install --root=/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

83
lfs/python3-setuptools-scm Normal file
View File

@@ -0,0 +1,83 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# 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 #
# 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 = 3.2.0
THISAPP = setuptools_scm-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-setuptools-scm
PAK_VER = 1
DEPS = "python3"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 178e4e7b14c163e0e77ae7ec6684cc0f
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_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && python3 setup.py build
cd $(DIR_APP) && python3 setup.py install --root=/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

8
lfs/tor
View File

@@ -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 = 0.3.4.9
VER = 0.3.5.7
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 = 31
PAK_VER = 32
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8a303c7c2491cd27b1646f6efdc4a5d0
$(DL_FILE)_MD5 = 8076f11045b5a94fd4ef0a0114b845f6
install : $(TARGET)

5
make.sh
View File

@@ -1502,6 +1502,8 @@ buildipfire() {
lfsmake2 python-progressbar
lfsmake2 python-xattr
lfsmake2 ddns
lfsmake2 python3-setuptools
lfsmake2 python3-setuptools-scm
lfsmake2 python3-six
lfsmake2 python3-dateutil
lfsmake2 python3-jmespath
@@ -1512,6 +1514,8 @@ buildipfire() {
lfsmake2 python3-rsa
lfsmake2 python3-pyasn1
lfsmake2 python3-botocore
lfsmake2 python3-llfuse
lfsmake2 python3-msgpack
lfsmake2 aws-cli
lfsmake2 transmission
lfsmake2 dpfhack
@@ -1585,6 +1589,7 @@ buildipfire() {
lfsmake2 nss-myhostname
lfsmake2 dehydrated
lfsmake2 shairport-sync
lfsmake2 borgbackup
}
buildinstaller() {

13
src/initscripts/system/firewall
View File

@@ -300,7 +300,7 @@ iptables_init() {
iptables -N OVPNINPUT
iptables -A INPUT -j OVPNINPUT
# TOR
# Tor
iptables -N TOR_INPUT
iptables -A INPUT -j TOR_INPUT
@@ -420,15 +420,6 @@ iptables_red_up() {
iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $DEVICE -j ACCEPT
fi
# Orange pinholes
if [ "$ORANGE_DEV" != "" ]; then
# This rule enables a host on ORANGE network to connect to the outside
# (only if we have a red connection)
if [ "$IFACE" != "" ]; then
iptables -A REDFORWARD -i $ORANGE_DEV -o $IFACE -j ACCEPT
fi
fi
if [ "$IFACE" != "" -a -f /var/ipfire/red/active ]; then
# DHCP
if [ "$RED_DEV" != "" -a "$RED_TYPE" == "DHCP" ]; then
@@ -476,7 +467,7 @@ iptables_red_up() {
iptables_red_down() {
# Prohibit packets to reach the masquerading rule
# while the wan interface is down - this is required to
# while the WAN interface is down - this is required to
# circumvent udp related NAT issues
# http://forum.ipfire.org/index.php?topic=11127.0
if [ -n "${IFACE}" ]; then