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

Conflicts:
	lfs/openssl-compat
This commit is contained in:
Arne Fitzenreiter
2015-03-29 19:33:04 +02:00
87 changed files with 2576 additions and 2410 deletions

View File

@@ -1,5 +0,0 @@
/srv/web/esniper/.htaccess
/srv/web/esniper/.config.php
/srv/web/esniper/.config.state.php
/srv/web/esniper/local/
/srv/web/esniper/.run/

View File

@@ -88,14 +88,27 @@ sub main {
# Flush all chains.
&flush();
# Reload firewall rules.
&preparerules();
# Prepare firewall rules.
if (! -z "${General::swroot}/firewall/input"){
&buildrules(\%configinputfw);
}
if (! -z "${General::swroot}/firewall/outgoing"){
&buildrules(\%configoutgoingfw);
}
if (! -z "${General::swroot}/firewall/config"){
&buildrules(\%configfwdfw);
}
# Load P2P block rules.
&p2pblock();
# Reload firewall policy.
run("/usr/sbin/firewall-policy");
#Reload firewall.local if present
if ( -f '/etc/sysconfig/firewall.local'){
run("/etc/sysconfig/firewall.local reload");
}
}
sub run {
@@ -146,18 +159,6 @@ sub flush {
run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX");
}
sub preparerules {
if (! -z "${General::swroot}/firewall/input"){
&buildrules(\%configinputfw);
}
if (! -z "${General::swroot}/firewall/outgoing"){
&buildrules(\%configoutgoingfw);
}
if (! -z "${General::swroot}/firewall/config"){
&buildrules(\%configfwdfw);
}
}
sub buildrules {
my $hash = shift;
@@ -512,10 +513,6 @@ sub buildrules {
}
}
}
#Reload firewall.local if present
if ( -f '/etc/sysconfig/firewall.local'){
run("/etc/sysconfig/firewall.local reload");
}
}
# Formats the given timestamp into the iptables format which is "hh:mm" UTC.

View File

@@ -1,7 +1,7 @@
Timeout 300
ServerSignature on
UseCanonicalName off
ServerTokens Full
ServerTokens Prod
LogLevel warn
CustomLog /var/log/httpd/access_log combined
Include /etc/httpd/conf/hostname.conf

View File

@@ -1,22 +0,0 @@
Listen 1006
<VirtualHost *:1006>
SSLEngine on
SSLProtocol all -SSLv2
SSLCipherSuite ALL:!ADH:!EXPORT56:!eNULL:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP
SSLCertificateFile /etc/httpd/server.crt
SSLCertificateKeyFile /etc/httpd/server.key
DocumentRoot /srv/web/esniper
Include /etc/httpd/conf/conf.d/php*.conf
<Directory /srv/web/esniper>
Options None
AllowOverride None
Order allow,deny
Allow from all
</Directory>
</VirtualHost>

View File

@@ -1,16 +0,0 @@
Listen 1002
<VirtualHost *:1002>
DocumentRoot /srv/web/phpaj
Include /etc/httpd/conf/conf.d/php*.conf
<Directory /srv/web/phpaj>
Options None
AllowOverride None
Order allow,deny
Allow from all
</Directory>
</VirtualHost>

View File

@@ -61,6 +61,7 @@ etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
etc/rc.d/init.d/network-vlans
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
@@ -229,6 +230,7 @@ etc/rc.d/rcsysinit.d/S73swconfig
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S90network-trigger
etc/rc.d/rcsysinit.d/S91network-vlans
etc/rc.d/rcsysinit.d/S92rngd
etc/rc.d/rc3.d/S15fireinfo

View File

@@ -10,7 +10,6 @@ usr/bin/curl
#usr/include/curl/multi.h
#usr/include/curl/stdcheaders.h
#usr/include/curl/typecheck-gcc.h
#usr/include/curl/types.h
#usr/lib/libcurl.a
#usr/lib/libcurl.la
usr/lib/libcurl.so
@@ -18,9 +17,233 @@ usr/lib/libcurl.so.3
usr/lib/libcurl.so.4
usr/lib/libcurl.so.4.3.0
#usr/lib/pkgconfig/libcurl.pc
#usr/share/aclocal/libcurl.m4
#usr/share/man/man1/curl-config.1
#usr/share/man/man1/curl.1
#usr/share/man/man1/mk-ca-bundle.1
#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
#usr/share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3
#usr/share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3
#usr/share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3
#usr/share/man/man3/CURLMOPT_PIPELINING.3
#usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3
#usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3
#usr/share/man/man3/CURLMOPT_SOCKETDATA.3
#usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3
#usr/share/man/man3/CURLMOPT_TIMERDATA.3
#usr/share/man/man3/CURLMOPT_TIMERFUNCTION.3
#usr/share/man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3
#usr/share/man/man3/CURLOPT_ACCEPT_ENCODING.3
#usr/share/man/man3/CURLOPT_ADDRESS_SCOPE.3
#usr/share/man/man3/CURLOPT_APPEND.3
#usr/share/man/man3/CURLOPT_AUTOREFERER.3
#usr/share/man/man3/CURLOPT_BUFFERSIZE.3
#usr/share/man/man3/CURLOPT_CAINFO.3
#usr/share/man/man3/CURLOPT_CAPATH.3
#usr/share/man/man3/CURLOPT_CERTINFO.3
#usr/share/man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3
#usr/share/man/man3/CURLOPT_CHUNK_DATA.3
#usr/share/man/man3/CURLOPT_CHUNK_END_FUNCTION.3
#usr/share/man/man3/CURLOPT_CLOSESOCKETDATA.3
#usr/share/man/man3/CURLOPT_CLOSESOCKETFUNCTION.3
#usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3
#usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3
#usr/share/man/man3/CURLOPT_CONNECT_ONLY.3
#usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3
#usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3
#usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3
#usr/share/man/man3/CURLOPT_COOKIE.3
#usr/share/man/man3/CURLOPT_COOKIEFILE.3
#usr/share/man/man3/CURLOPT_COOKIEJAR.3
#usr/share/man/man3/CURLOPT_COOKIELIST.3
#usr/share/man/man3/CURLOPT_COOKIESESSION.3
#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_CUSTOMREQUEST.3
#usr/share/man/man3/CURLOPT_DEBUGDATA.3
#usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3
#usr/share/man/man3/CURLOPT_DIRLISTONLY.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_USE_GLOBAL_CACHE.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
#usr/share/man/man3/CURLOPT_FAILONERROR.3
#usr/share/man/man3/CURLOPT_FILETIME.3
#usr/share/man/man3/CURLOPT_FNMATCH_DATA.3
#usr/share/man/man3/CURLOPT_FNMATCH_FUNCTION.3
#usr/share/man/man3/CURLOPT_FOLLOWLOCATION.3
#usr/share/man/man3/CURLOPT_FORBID_REUSE.3
#usr/share/man/man3/CURLOPT_FRESH_CONNECT.3
#usr/share/man/man3/CURLOPT_FTPPORT.3
#usr/share/man/man3/CURLOPT_FTPSSLAUTH.3
#usr/share/man/man3/CURLOPT_FTP_ACCOUNT.3
#usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3
#usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3
#usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3
#usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3
#usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3
#usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3
#usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3
#usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3
#usr/share/man/man3/CURLOPT_FTP_USE_PRET.3
#usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3
#usr/share/man/man3/CURLOPT_HEADER.3
#usr/share/man/man3/CURLOPT_HEADERDATA.3
#usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
#usr/share/man/man3/CURLOPT_HEADEROPT.3
#usr/share/man/man3/CURLOPT_HTTP200ALIASES.3
#usr/share/man/man3/CURLOPT_HTTPAUTH.3
#usr/share/man/man3/CURLOPT_HTTPGET.3
#usr/share/man/man3/CURLOPT_HTTPHEADER.3
#usr/share/man/man3/CURLOPT_HTTPPOST.3
#usr/share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3
#usr/share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3
#usr/share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3
#usr/share/man/man3/CURLOPT_HTTP_VERSION.3
#usr/share/man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3
#usr/share/man/man3/CURLOPT_INFILESIZE.3
#usr/share/man/man3/CURLOPT_INFILESIZE_LARGE.3
#usr/share/man/man3/CURLOPT_INTERFACE.3
#usr/share/man/man3/CURLOPT_INTERLEAVEDATA.3
#usr/share/man/man3/CURLOPT_INTERLEAVEFUNCTION.3
#usr/share/man/man3/CURLOPT_IOCTLDATA.3
#usr/share/man/man3/CURLOPT_IOCTLFUNCTION.3
#usr/share/man/man3/CURLOPT_IPRESOLVE.3
#usr/share/man/man3/CURLOPT_ISSUERCERT.3
#usr/share/man/man3/CURLOPT_KEYPASSWD.3
#usr/share/man/man3/CURLOPT_KRBLEVEL.3
#usr/share/man/man3/CURLOPT_LOCALPORT.3
#usr/share/man/man3/CURLOPT_LOCALPORTRANGE.3
#usr/share/man/man3/CURLOPT_LOGIN_OPTIONS.3
#usr/share/man/man3/CURLOPT_LOW_SPEED_LIMIT.3
#usr/share/man/man3/CURLOPT_LOW_SPEED_TIME.3
#usr/share/man/man3/CURLOPT_MAIL_AUTH.3
#usr/share/man/man3/CURLOPT_MAIL_FROM.3
#usr/share/man/man3/CURLOPT_MAIL_RCPT.3
#usr/share/man/man3/CURLOPT_MAXCONNECTS.3
#usr/share/man/man3/CURLOPT_MAXFILESIZE.3
#usr/share/man/man3/CURLOPT_MAXFILESIZE_LARGE.3
#usr/share/man/man3/CURLOPT_MAXREDIRS.3
#usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
#usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
#usr/share/man/man3/CURLOPT_NETRC.3
#usr/share/man/man3/CURLOPT_NETRC_FILE.3
#usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
#usr/share/man/man3/CURLOPT_NEW_FILE_PERMS.3
#usr/share/man/man3/CURLOPT_NOBODY.3
#usr/share/man/man3/CURLOPT_NOPROGRESS.3
#usr/share/man/man3/CURLOPT_NOPROXY.3
#usr/share/man/man3/CURLOPT_NOSIGNAL.3
#usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3
#usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3
#usr/share/man/man3/CURLOPT_PASSWORD.3
#usr/share/man/man3/CURLOPT_PORT.3
#usr/share/man/man3/CURLOPT_POST.3
#usr/share/man/man3/CURLOPT_POSTFIELDS.3
#usr/share/man/man3/CURLOPT_POSTFIELDSIZE.3
#usr/share/man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3
#usr/share/man/man3/CURLOPT_POSTQUOTE.3
#usr/share/man/man3/CURLOPT_POSTREDIR.3
#usr/share/man/man3/CURLOPT_PREQUOTE.3
#usr/share/man/man3/CURLOPT_PRIVATE.3
#usr/share/man/man3/CURLOPT_PROGRESSDATA.3
#usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3
#usr/share/man/man3/CURLOPT_PROTOCOLS.3
#usr/share/man/man3/CURLOPT_PROXY.3
#usr/share/man/man3/CURLOPT_PROXYAUTH.3
#usr/share/man/man3/CURLOPT_PROXYHEADER.3
#usr/share/man/man3/CURLOPT_PROXYPASSWORD.3
#usr/share/man/man3/CURLOPT_PROXYPORT.3
#usr/share/man/man3/CURLOPT_PROXYTYPE.3
#usr/share/man/man3/CURLOPT_PROXYUSERNAME.3
#usr/share/man/man3/CURLOPT_PROXYUSERPWD.3
#usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3
#usr/share/man/man3/CURLOPT_PUT.3
#usr/share/man/man3/CURLOPT_QUOTE.3
#usr/share/man/man3/CURLOPT_RANDOM_FILE.3
#usr/share/man/man3/CURLOPT_RANGE.3
#usr/share/man/man3/CURLOPT_READDATA.3
#usr/share/man/man3/CURLOPT_READFUNCTION.3
#usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3
#usr/share/man/man3/CURLOPT_REFERER.3
#usr/share/man/man3/CURLOPT_RESOLVE.3
#usr/share/man/man3/CURLOPT_RESUME_FROM.3
#usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3
#usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3
#usr/share/man/man3/CURLOPT_RTSP_REQUEST.3
#usr/share/man/man3/CURLOPT_RTSP_SERVER_CSEQ.3
#usr/share/man/man3/CURLOPT_RTSP_SESSION_ID.3
#usr/share/man/man3/CURLOPT_RTSP_STREAM_URI.3
#usr/share/man/man3/CURLOPT_RTSP_TRANSPORT.3
#usr/share/man/man3/CURLOPT_SASL_IR.3
#usr/share/man/man3/CURLOPT_SEEKDATA.3
#usr/share/man/man3/CURLOPT_SEEKFUNCTION.3
#usr/share/man/man3/CURLOPT_SHARE.3
#usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
#usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3
#usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
#usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
#usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3
#usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
#usr/share/man/man3/CURLOPT_SSH_KEYDATA.3
#usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3
#usr/share/man/man3/CURLOPT_SSH_KNOWNHOSTS.3
#usr/share/man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3
#usr/share/man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3
#usr/share/man/man3/CURLOPT_SSLCERT.3
#usr/share/man/man3/CURLOPT_SSLCERTTYPE.3
#usr/share/man/man3/CURLOPT_SSLENGINE.3
#usr/share/man/man3/CURLOPT_SSLENGINE_DEFAULT.3
#usr/share/man/man3/CURLOPT_SSLKEY.3
#usr/share/man/man3/CURLOPT_SSLKEYTYPE.3
#usr/share/man/man3/CURLOPT_SSLVERSION.3
#usr/share/man/man3/CURLOPT_SSL_CIPHER_LIST.3
#usr/share/man/man3/CURLOPT_SSL_CTX_DATA.3
#usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3
#usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3
#usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3
#usr/share/man/man3/CURLOPT_SSL_OPTIONS.3
#usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3
#usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3
#usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3
#usr/share/man/man3/CURLOPT_STDERR.3
#usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3
#usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3
#usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3
#usr/share/man/man3/CURLOPT_TCP_NODELAY.3
#usr/share/man/man3/CURLOPT_TELNETOPTIONS.3
#usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3
#usr/share/man/man3/CURLOPT_TIMECONDITION.3
#usr/share/man/man3/CURLOPT_TIMEOUT.3
#usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
#usr/share/man/man3/CURLOPT_TIMEVALUE.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
#usr/share/man/man3/CURLOPT_TRANSFERTEXT.3
#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_UPLOAD.3
#usr/share/man/man3/CURLOPT_URL.3
#usr/share/man/man3/CURLOPT_USERAGENT.3
#usr/share/man/man3/CURLOPT_USERNAME.3
#usr/share/man/man3/CURLOPT_USERPWD.3
#usr/share/man/man3/CURLOPT_USE_SSL.3
#usr/share/man/man3/CURLOPT_VERBOSE.3
#usr/share/man/man3/CURLOPT_WILDCARDMATCH.3
#usr/share/man/man3/CURLOPT_WRITEDATA.3
#usr/share/man/man3/CURLOPT_WRITEFUNCTION.3
#usr/share/man/man3/CURLOPT_XFERINFODATA.3
#usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3
#usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3
#usr/share/man/man3/curl_easy_cleanup.3
#usr/share/man/man3/curl_easy_duphandle.3
#usr/share/man/man3/curl_easy_escape.3

View File

@@ -1,6 +1,7 @@
#etc/dhcp
#etc/dhcp/dhclient.conf
#etc/dhcp/dhclient.conf.example
etc/dhcp/dhcpd.conf
#etc/dhcp/dhcpd.conf.example
#usr/bin/omshell
#usr/include/dhcpctl
#usr/include/dhcpctl/dhcpctl.h

View File

@@ -1,3 +1,6 @@
#lib/dhcpcd
#lib/dhcpcd/dev
#lib/dhcpcd/dev/udev.so
sbin/dhcpcd
#usr/share/man/man5/dhcpcd.conf.5
#usr/share/man/man8/dhcpcd-run-hooks.8
@@ -6,6 +9,8 @@ var/ipfire/dhcpc/dhcpcd-hooks
#var/ipfire/dhcpc/dhcpcd-hooks/01-test
#var/ipfire/dhcpc/dhcpcd-hooks/02-dump
#var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
#var/ipfire/dhcpc/dhcpcd-hooks/10-wpa_supplicant
#var/ipfire/dhcpc/dhcpcd-hooks/15-timezone
#var/ipfire/dhcpc/dhcpcd-hooks/29-lookup-hostname
#var/ipfire/dhcpc/dhcpcd-hooks/30-hostname
#var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe

View File

@@ -5,10 +5,11 @@
#usr/lib/libexpat.la
usr/lib/libexpat.so
usr/lib/libexpat.so.1
usr/lib/libexpat.so.1.5.0
#usr/man/man1/xmlwf.1
#usr/share/doc/expat-2.0.0
#usr/share/doc/expat-2.0.0/expat.png
#usr/share/doc/expat-2.0.0/reference.html
#usr/share/doc/expat-2.0.0/style.css
#usr/share/doc/expat-2.0.0/valid-xhtml10.png
usr/lib/libexpat.so.1.6.0
#usr/lib/pkgconfig/expat.pc
#usr/share/doc/expat-2.1.0
#usr/share/doc/expat-2.1.0/expat.png
#usr/share/doc/expat-2.1.0/reference.html
#usr/share/doc/expat-2.1.0/style.css
#usr/share/doc/expat-2.1.0/valid-xhtml10.png
#usr/share/man/man1/xmlwf.1

File diff suppressed because it is too large Load Diff

View File

@@ -63,6 +63,7 @@ etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/mysql
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
etc/rc.d/init.d/network-vlans
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
@@ -234,6 +235,7 @@ etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S90network-trigger
etc/rc.d/rcsysinit.d/S91network-vlans
etc/rc.d/rcsysinit.d/S92rngd
etc/rc.d/rc3.d/S15fireinfo

View File

@@ -1,5 +1,6 @@
#etc/logrotate.d
etc/logrotate.d/.empty
#usr/man/man5/logrotate.5
#usr/man/man8/logrotate.8
usr/sbin/logrotate
var/lib/logrotate.status

View File

@@ -1,6 +1,6 @@
#etc/logwatch
etc/logwatch/conf
#etc/logwatch/conf/html
#etc/logwatch/logwatch.cron
#etc/logwatch/conf/ignore.conf
#etc/logwatch/conf/logfiles
#etc/logwatch/conf/logwatch.conf
@@ -18,13 +18,17 @@ usr/sbin/logwatch
#usr/share/logwatch/default.conf/html/header.html
usr/share/logwatch/default.conf/ignore.conf
#usr/share/logwatch/default.conf/logfiles
#usr/share/logwatch/default.conf/logfiles/audit_log.conf
#usr/share/logwatch/default.conf/logfiles/autorpm.conf
#usr/share/logwatch/default.conf/logfiles/bfd.conf
#usr/share/logwatch/default.conf/logfiles/cisco.conf
#usr/share/logwatch/default.conf/logfiles/citadel.conf
usr/share/logwatch/default.conf/logfiles/clam-update.conf
#usr/share/logwatch/default.conf/logfiles/clamav.conf
usr/share/logwatch/default.conf/logfiles/cron.conf
#usr/share/logwatch/default.conf/logfiles/daemon.conf
#usr/share/logwatch/default.conf/logfiles/denyhosts.conf
#usr/share/logwatch/default.conf/logfiles/dirsrv.conf
#usr/share/logwatch/default.conf/logfiles/dnssec.conf
#usr/share/logwatch/default.conf/logfiles/dpkg.conf
#usr/share/logwatch/default.conf/logfiles/emerge.conf
@@ -32,15 +36,20 @@ usr/share/logwatch/default.conf/logfiles/cron.conf
#usr/share/logwatch/default.conf/logfiles/exim.conf
#usr/share/logwatch/default.conf/logfiles/extreme-networks.conf
#usr/share/logwatch/default.conf/logfiles/fail2ban.conf
#usr/share/logwatch/default.conf/logfiles/freeradius.conf
#usr/share/logwatch/default.conf/logfiles/http-error.conf
usr/share/logwatch/default.conf/logfiles/http.conf
usr/share/logwatch/default.conf/logfiles/iptables.conf
usr/share/logwatch/default.conf/logfiles/kernel.conf
usr/share/logwatch/default.conf/logfiles/maillog.conf
usr/share/logwatch/default.conf/logfiles/messages.conf
#usr/share/logwatch/default.conf/logfiles/mysql-mmm.conf
#usr/share/logwatch/default.conf/logfiles/mysql.conf
#usr/share/logwatch/default.conf/logfiles/netopia.conf
#usr/share/logwatch/default.conf/logfiles/netscreen.conf
usr/share/logwatch/default.conf/logfiles/php.conf
#usr/share/logwatch/default.conf/logfiles/pix.conf
#usr/share/logwatch/default.conf/logfiles/postgresql.conf
#usr/share/logwatch/default.conf/logfiles/pureftp.conf
#usr/share/logwatch/default.conf/logfiles/qmail-pop3d-current.conf
#usr/share/logwatch/default.conf/logfiles/qmail-pop3ds-current.conf
@@ -51,13 +60,17 @@ usr/share/logwatch/default.conf/logfiles/resolver.conf
usr/share/logwatch/default.conf/logfiles/samba.conf
#usr/share/logwatch/default.conf/logfiles/secure.conf
#usr/share/logwatch/default.conf/logfiles/sonicwall.conf
#usr/share/logwatch/default.conf/logfiles/spamassassin.conf
usr/share/logwatch/default.conf/logfiles/syslog.conf
#usr/share/logwatch/default.conf/logfiles/tac_acc.conf
#usr/share/logwatch/default.conf/logfiles/tivoli-smc.conf
#usr/share/logwatch/default.conf/logfiles/up2date.conf
#usr/share/logwatch/default.conf/logfiles/vdr.conf
usr/share/logwatch/default.conf/logfiles/vsftpd.conf
usr/share/logwatch/default.conf/logfiles/windows.conf
usr/share/logwatch/default.conf/logfiles/xferlog.conf
#usr/share/logwatch/default.conf/logfiles/yum.conf
#usr/share/logwatch/default.conf/logfiles/zypp.conf
usr/share/logwatch/default.conf/logwatch.conf
usr/share/logwatch/default.conf/services
#usr/share/logwatch/default.conf/services/afpd.conf
@@ -66,8 +79,10 @@ usr/share/logwatch/default.conf/services/amavis.conf
#usr/share/logwatch/default.conf/services/audit.conf
#usr/share/logwatch/default.conf/services/automount.conf
#usr/share/logwatch/default.conf/services/autorpm.conf
#usr/share/logwatch/default.conf/services/barracuda.conf
#usr/share/logwatch/default.conf/services/bfd.conf
#usr/share/logwatch/default.conf/services/cisco.conf
#usr/share/logwatch/default.conf/services/citadel.conf
usr/share/logwatch/default.conf/services/clam-update.conf
#usr/share/logwatch/default.conf/services/clamav-milter.conf
usr/share/logwatch/default.conf/services/clamav.conf
@@ -75,6 +90,7 @@ usr/share/logwatch/default.conf/services/clamav.conf
usr/share/logwatch/default.conf/services/cron.conf
#usr/share/logwatch/default.conf/services/denyhosts.conf
usr/share/logwatch/default.conf/services/dhcpd.conf
#usr/share/logwatch/default.conf/services/dirsrv.conf
#usr/share/logwatch/default.conf/services/dnssec.conf
#usr/share/logwatch/default.conf/services/dovecot.conf
#usr/share/logwatch/default.conf/services/dpkg.conf
@@ -86,8 +102,11 @@ usr/share/logwatch/default.conf/services/dhcpd.conf
#usr/share/logwatch/default.conf/services/eximstats.conf
#usr/share/logwatch/default.conf/services/extreme-networks.conf
#usr/share/logwatch/default.conf/services/fail2ban.conf
#usr/share/logwatch/default.conf/services/fetchmail.conf
#usr/share/logwatch/default.conf/services/freeradius.conf
#usr/share/logwatch/default.conf/services/ftpd-messages.conf
#usr/share/logwatch/default.conf/services/ftpd-xferlog.conf
#usr/share/logwatch/default.conf/services/http-error.conf
usr/share/logwatch/default.conf/services/http.conf
#usr/share/logwatch/default.conf/services/identd.conf
usr/share/logwatch/default.conf/services/imapd.conf
@@ -96,13 +115,20 @@ usr/share/logwatch/default.conf/services/init.conf
usr/share/logwatch/default.conf/services/ipop3d.conf
usr/share/logwatch/default.conf/services/iptables.conf
usr/share/logwatch/default.conf/services/kernel.conf
#usr/share/logwatch/default.conf/services/knockd.conf
#usr/share/logwatch/default.conf/services/lvm.conf
#usr/share/logwatch/default.conf/services/mailscanner.conf
#usr/share/logwatch/default.conf/services/mdadm.conf
#usr/share/logwatch/default.conf/services/mod_security2.conf
usr/share/logwatch/default.conf/services/modprobe.conf
#usr/share/logwatch/default.conf/services/mountd.conf
#usr/share/logwatch/default.conf/services/mysql-mmm.conf
#usr/share/logwatch/default.conf/services/mysql.conf
#usr/share/logwatch/default.conf/services/named.conf
#usr/share/logwatch/default.conf/services/netopia.conf
#usr/share/logwatch/default.conf/services/netscreen.conf
#usr/share/logwatch/default.conf/services/oidentd.conf
#usr/share/logwatch/default.conf/services/omsa.conf
usr/share/logwatch/default.conf/services/openvpn.conf
usr/share/logwatch/default.conf/services/pam.conf
usr/share/logwatch/default.conf/services/pam_pwdb.conf
@@ -113,8 +139,10 @@ usr/share/logwatch/default.conf/services/pluto.conf
usr/share/logwatch/default.conf/services/pop3.conf
#usr/share/logwatch/default.conf/services/portsentry.conf
usr/share/logwatch/default.conf/services/postfix.conf
#usr/share/logwatch/default.conf/services/postgresql.conf
#usr/share/logwatch/default.conf/services/pound.conf
#usr/share/logwatch/default.conf/services/proftpd-messages.conf
#usr/share/logwatch/default.conf/services/puppet.conf
#usr/share/logwatch/default.conf/services/pureftpd.conf
#usr/share/logwatch/default.conf/services/qmail-pop3d.conf
#usr/share/logwatch/default.conf/services/qmail-pop3ds.conf
@@ -123,6 +151,7 @@ usr/share/logwatch/default.conf/services/postfix.conf
#usr/share/logwatch/default.conf/services/qmail.conf
#usr/share/logwatch/default.conf/services/raid.conf
usr/share/logwatch/default.conf/services/resolver.conf
#usr/share/logwatch/default.conf/services/rsyslogd.conf
#usr/share/logwatch/default.conf/services/rt314.conf
usr/share/logwatch/default.conf/services/samba.conf
usr/share/logwatch/default.conf/services/saslauthd.conf
@@ -134,23 +163,30 @@ usr/share/logwatch/default.conf/services/scsi.conf
#usr/share/logwatch/default.conf/services/slon.conf
#usr/share/logwatch/default.conf/services/smartd.conf
#usr/share/logwatch/default.conf/services/sonicwall.conf
#usr/share/logwatch/default.conf/services/spamassassin.conf
usr/share/logwatch/default.conf/services/sshd.conf
usr/share/logwatch/default.conf/services/sshd2.conf
#usr/share/logwatch/default.conf/services/stunnel.conf
usr/share/logwatch/default.conf/services/sudo.conf
#usr/share/logwatch/default.conf/services/syslog-ng.conf
usr/share/logwatch/default.conf/services/syslogd.conf
#usr/share/logwatch/default.conf/services/tac_acc.conf
#usr/share/logwatch/default.conf/services/tivoli-smc.conf
#usr/share/logwatch/default.conf/services/up2date.conf
#usr/share/logwatch/default.conf/services/vdr.conf
#usr/share/logwatch/default.conf/services/vpopmail.conf
usr/share/logwatch/default.conf/services/vsftpd.conf
usr/share/logwatch/default.conf/services/windows.conf
#usr/share/logwatch/default.conf/services/xntpd.conf
#usr/share/logwatch/default.conf/services/yum.conf
#usr/share/logwatch/default.conf/services/zypp.conf
usr/share/logwatch/default.conf/services/zz-disk_space.conf
#usr/share/logwatch/default.conf/services/zz-fortune.conf
#usr/share/logwatch/default.conf/services/zz-lm_sensors.conf
usr/share/logwatch/default.conf/services/zz-network.conf
usr/share/logwatch/default.conf/services/zz-runtime.conf
#usr/share/logwatch/default.conf/services/zz-sys.conf
#usr/share/logwatch/default.conf/services/zz-zfs.conf
#usr/share/logwatch/dist.conf
usr/share/logwatch/dist.conf/logfiles
usr/share/logwatch/dist.conf/services
@@ -184,8 +220,10 @@ usr/share/logwatch/scripts/services/amavis
#usr/share/logwatch/scripts/services/audit
#usr/share/logwatch/scripts/services/automount
#usr/share/logwatch/scripts/services/autorpm
#usr/share/logwatch/scripts/services/barracuda
#usr/share/logwatch/scripts/services/bfd
#usr/share/logwatch/scripts/services/cisco
#usr/share/logwatch/scripts/services/citadel
usr/share/logwatch/scripts/services/clam-update
usr/share/logwatch/scripts/services/clamav
#usr/share/logwatch/scripts/services/clamav-milter
@@ -194,6 +232,7 @@ usr/share/logwatch/scripts/services/cron
#usr/share/logwatch/scripts/services/denyhosts
usr/share/logwatch/scripts/services/dhcpd
usr/share/logwatch/scripts/services/dialup
#usr/share/logwatch/scripts/services/dirsrv
#usr/share/logwatch/scripts/services/dnssec
#usr/share/logwatch/scripts/services/dovecot
#usr/share/logwatch/scripts/services/dpkg
@@ -205,9 +244,12 @@ usr/share/logwatch/scripts/services/dialup
#usr/share/logwatch/scripts/services/eximstats
#usr/share/logwatch/scripts/services/extreme-networks
#usr/share/logwatch/scripts/services/fail2ban
#usr/share/logwatch/scripts/services/fetchmail
#usr/share/logwatch/scripts/services/freeradius
#usr/share/logwatch/scripts/services/ftpd-messages
#usr/share/logwatch/scripts/services/ftpd-xferlog
usr/share/logwatch/scripts/services/http
#usr/share/logwatch/scripts/services/http-error
#usr/share/logwatch/scripts/services/identd
usr/share/logwatch/scripts/services/imapd
#usr/share/logwatch/scripts/services/in.qpopper
@@ -215,13 +257,20 @@ usr/share/logwatch/scripts/services/init
usr/share/logwatch/scripts/services/ipop3d
usr/share/logwatch/scripts/services/iptables
usr/share/logwatch/scripts/services/kernel
#usr/share/logwatch/scripts/services/knockd
#usr/share/logwatch/scripts/services/lvm
#usr/share/logwatch/scripts/services/mailscanner
#usr/share/logwatch/scripts/services/mdadm
#usr/share/logwatch/scripts/services/mod_security2
usr/share/logwatch/scripts/services/modprobe
#usr/share/logwatch/scripts/services/mountd
#usr/share/logwatch/scripts/services/mysql
#usr/share/logwatch/scripts/services/mysql-mmm
#usr/share/logwatch/scripts/services/named
#usr/share/logwatch/scripts/services/netopia
#usr/share/logwatch/scripts/services/netscreen
#usr/share/logwatch/scripts/services/oidentd
#usr/share/logwatch/scripts/services/omsa
usr/share/logwatch/scripts/services/openvpn
usr/share/logwatch/scripts/services/pam
usr/share/logwatch/scripts/services/pam_pwdb
@@ -232,8 +281,10 @@ usr/share/logwatch/scripts/services/pluto
usr/share/logwatch/scripts/services/pop3
#usr/share/logwatch/scripts/services/portsentry
usr/share/logwatch/scripts/services/postfix
#usr/share/logwatch/scripts/services/postgresql
#usr/share/logwatch/scripts/services/pound
#usr/share/logwatch/scripts/services/proftpd-messages
#usr/share/logwatch/scripts/services/puppet
#usr/share/logwatch/scripts/services/pureftpd
#usr/share/logwatch/scripts/services/qmail
#usr/share/logwatch/scripts/services/qmail-pop3d
@@ -242,6 +293,7 @@ usr/share/logwatch/scripts/services/postfix
#usr/share/logwatch/scripts/services/qmail-smtpd
#usr/share/logwatch/scripts/services/raid
#usr/share/logwatch/scripts/services/resolver
#usr/share/logwatch/scripts/services/rsyslogd
#usr/share/logwatch/scripts/services/rt314
usr/share/logwatch/scripts/services/samba
usr/share/logwatch/scripts/services/saslauthd
@@ -253,23 +305,30 @@ usr/share/logwatch/scripts/services/scsi
#usr/share/logwatch/scripts/services/slon
#usr/share/logwatch/scripts/services/smartd
#usr/share/logwatch/scripts/services/sonicwall
#usr/share/logwatch/scripts/services/spamassassin
usr/share/logwatch/scripts/services/sshd
usr/share/logwatch/scripts/services/sshd2
#usr/share/logwatch/scripts/services/stunnel
usr/share/logwatch/scripts/services/sudo
#usr/share/logwatch/scripts/services/syslog-ng
usr/share/logwatch/scripts/services/syslogd
#usr/share/logwatch/scripts/services/tac_acc
#usr/share/logwatch/scripts/services/tivoli-smc
#usr/share/logwatch/scripts/services/up2date
#usr/share/logwatch/scripts/services/vdr
#usr/share/logwatch/scripts/services/vpopmail
usr/share/logwatch/scripts/services/vsftpd
usr/share/logwatch/scripts/services/windows
#usr/share/logwatch/scripts/services/xntpd
#usr/share/logwatch/scripts/services/yum
#usr/share/logwatch/scripts/services/zypp
usr/share/logwatch/scripts/services/zz-disk_space
#usr/share/logwatch/scripts/services/zz-fortune
#usr/share/logwatch/scripts/services/zz-lm_sensors
usr/share/logwatch/scripts/services/zz-network
usr/share/logwatch/scripts/services/zz-runtime
#usr/share/logwatch/scripts/services/zz-sys
#usr/share/logwatch/scripts/services/zz-zfs
#usr/share/logwatch/scripts/shared
usr/share/logwatch/scripts/shared/applybinddate
usr/share/logwatch/scripts/shared/applyeurodate
@@ -289,6 +348,11 @@ usr/share/logwatch/scripts/shared/onlyservice
usr/share/logwatch/scripts/shared/remove
usr/share/logwatch/scripts/shared/removeheaders
usr/share/logwatch/scripts/shared/removeservice
#usr/share/man/man1/amavis-logwatch.1
#usr/share/man/man1/postfix-logwatch.1
#usr/share/man/man5/ignore.conf.5
#usr/share/man/man5/logwatch.conf.5
#usr/share/man/man5/override.conf.5
#usr/share/man/man8/logwatch.8
var/cache/logwatch
var/log/logwatch

View File

@@ -30,6 +30,7 @@ etc/strongswan.d/charon/eap-tls.conf
etc/strongswan.d/charon/eap-ttls.conf
etc/strongswan.d/charon/farp.conf
etc/strongswan.d/charon/fips-prf.conf
etc/strongswan.d/charon/gcm.conf
etc/strongswan.d/charon/gcrypt.conf
etc/strongswan.d/charon/gmp.conf
etc/strongswan.d/charon/hmac.conf
@@ -107,6 +108,7 @@ usr/lib/ipsec/plugins/libstrongswan-eap-tls.so
usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so
usr/lib/ipsec/plugins/libstrongswan-farp.so
usr/lib/ipsec/plugins/libstrongswan-fips-prf.so
usr/lib/ipsec/plugins/libstrongswan-gcm.so
usr/lib/ipsec/plugins/libstrongswan-gcrypt.so
usr/lib/ipsec/plugins/libstrongswan-gmp.so
usr/lib/ipsec/plugins/libstrongswan-hmac.so
@@ -187,6 +189,7 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/eap-ttls.conf
#usr/share/strongswan/templates/config/plugins/farp.conf
#usr/share/strongswan/templates/config/plugins/fips-prf.conf
#usr/share/strongswan/templates/config/plugins/gcm.conf
#usr/share/strongswan/templates/config/plugins/gcrypt.conf
#usr/share/strongswan/templates/config/plugins/gmp.conf
#usr/share/strongswan/templates/config/plugins/hmac.conf

View File

@@ -2,7 +2,6 @@ bin/udevadm
etc/modprobe.d/blacklist.conf
etc/udev
#etc/udev/rules.d
#etc/udev/rules.d/30-persistent-network.rules
#etc/udev/rules.d/55-lfs.rules
#etc/udev/rules.d/81-cdrom.rules
#etc/udev/rules.d/83-cdrom-symlinks.rules
@@ -29,6 +28,7 @@ lib/udev
#lib/udev/hwdb.d/60-keyboard.hwdb
#lib/udev/init-net-rules.sh
#lib/udev/mtd_probe
#lib/udev/network-hotplug-rename
#lib/udev/rule_generator.functions
#lib/udev/rules.d
#lib/udev/rules.d/25-alsa.rules
@@ -37,6 +37,7 @@ lib/udev
#lib/udev/rules.d/50-udev-default.rules
#lib/udev/rules.d/60-cdrom_id.rules
#lib/udev/rules.d/60-keyboard.rules
#lib/udev/rules.d/60-net.rules
#lib/udev/rules.d/60-persistent-alsa.rules
#lib/udev/rules.d/60-persistent-input.rules
#lib/udev/rules.d/60-persistent-serial.rules

View File

@@ -21,7 +21,7 @@ RANDFILE = $dir/tmp/.rand
x509_extensions = usr_cert
default_days = 999999
default_crl_days= 30
default_md = md5
default_md = sha256
preserve = no
policy = policy_match
email_in_dn = no
@@ -35,7 +35,7 @@ commonName = supplied
emailAddress = optional
[ req ]
default_bits = 1024
default_bits = 2048
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes

3
config/udev/60-net.rules Normal file
View File

@@ -0,0 +1,3 @@
# Call a script that checks for the right name of the new device.
# If it matches the configuration it will be renamed accordingly.
ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/network-hotplug-rename", RESULT=="?*", NAME="$result"

View File

@@ -0,0 +1,75 @@
#!/bin/bash
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2015 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/>. #
# #
###############################################################################
# Check if all appropriate variables are set
[ -n "${INTERFACE}" ] || exit 2
# Ignore virtual interfaces, etc.
case "${INTERFACE}" in
lo)
exit 0
;;
tun*)
exit 0
;;
ppp*)
exit 0
;;
esac
# Check if INTERFACE actually exists
[ -d "/sys/class/net/${INTERFACE}" ] || exit 1
# If the network configuration is not readable,
# we cannot go on.
if [ ! -r "/var/ipfire/ethernet/settings" ]; then
exit 1
fi
# Read network settings
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
# Standard zones
ZONES="RED GREEN ORANGE BLUE"
# Determine the address of INTERFACE
ADDRESS="$(</sys/class/net/${INTERFACE}/address)"
# Walk through all zones and find the matching interface
for zone in ${ZONES}; do
address="${zone}_MACADDR"
device="${zone}_DEV"
# Skip if address or device is unset
[ -n "${!address}" -a -n "${!device}" ] || continue
# If a matching interface has been found we will
# print the name to which udev will rename it.
if [ "${ADDRESS}" = "${!address}" ]; then
echo "${!device}"
exit 0
fi
done
# If we get here we have not found a matching device,
# but we won't return an error any way. The new device
# will remain with the previous name.
exit 0