webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 20:42:58 +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
2018-09-26 14:49:34 +02:00
parent eadad5fda6 0a5823db02
commit 2d475a3c6c
554 changed files with 1394 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/backup/backup.pl
View File

@@ -138,11 +138,8 @@ elsif ($ARGV[0] eq 'cli') {
elsif ($ARGV[0] eq 'addonbackup') {
system("tar -cvzf /var/ipfire/backup/addons/backup/$ARGV[1].ipf --files-from='/var/ipfire/backup/addons/includes/$ARGV[1]'");
}
elsif ($ARGV[0] =~ /ipf$/ ) {
system("rm /var/ipfire/backup/$ARGV[0]");
}
elsif ($ARGV[0] =~ /iso$/ ) {
system("rm /var/tmp/backupiso/$ARGV[0]");
elsif ($ARGV[0] =~ /\.(iso|ipf)$/ ) {
unlink("$ARGV[0]");
}
elsif ($ARGV[0] eq '') {
printf "No argument given, please use <include><exclude><cli>\n"

422
config/ca-certificates/certdata.txt
View File

@@ -7381,136 +7381,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
# Certificate "ComSign CA"
#
# Issuer: C=IL,O=ComSign,CN=ComSign CA
# Serial Number:14:13:96:83:14:55:8c:ea:7b:63:e5:fc:34:87:77:44
# Subject: C=IL,O=ComSign,CN=ComSign CA
# Not Valid Before: Wed Mar 24 11:32:18 2004
# Not Valid After : Mon Mar 19 15:02:18 2029
# Fingerprint (MD5): CD:F4:39:F3:B5:18:50:D7:3E:A4:C5:91:A0:3E:21:4B
# Fingerprint (SHA1): E1:A4:5B:14:1A:21:DA:1A:79:F4:1A:42:A9:61:D6:69:CD:06:34:C1
CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "ComSign CA"
CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
CKA_SUBJECT MULTILINE_OCTAL
\060\064\061\023\060\021\006\003\125\004\003\023\012\103\157\155
\123\151\147\156\040\103\101\061\020\060\016\006\003\125\004\012
\023\007\103\157\155\123\151\147\156\061\013\060\011\006\003\125
\004\006\023\002\111\114
END
CKA_ID UTF8 "0"
CKA_ISSUER MULTILINE_OCTAL
\060\064\061\023\060\021\006\003\125\004\003\023\012\103\157\155
\123\151\147\156\040\103\101\061\020\060\016\006\003\125\004\012
\023\007\103\157\155\123\151\147\156\061\013\060\011\006\003\125
\004\006\023\002\111\114
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\020\024\023\226\203\024\125\214\352\173\143\345\374\064\207
\167\104
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\223\060\202\002\173\240\003\002\001\002\002\020\024
\023\226\203\024\125\214\352\173\143\345\374\064\207\167\104\060
\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\064
\061\023\060\021\006\003\125\004\003\023\012\103\157\155\123\151
\147\156\040\103\101\061\020\060\016\006\003\125\004\012\023\007
\103\157\155\123\151\147\156\061\013\060\011\006\003\125\004\006
\023\002\111\114\060\036\027\015\060\064\060\063\062\064\061\061
\063\062\061\070\132\027\015\062\071\060\063\061\071\061\065\060
\062\061\070\132\060\064\061\023\060\021\006\003\125\004\003\023
\012\103\157\155\123\151\147\156\040\103\101\061\020\060\016\006
\003\125\004\012\023\007\103\157\155\123\151\147\156\061\013\060
\011\006\003\125\004\006\023\002\111\114\060\202\001\042\060\015
\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
\017\000\060\202\001\012\002\202\001\001\000\360\344\124\151\053
\323\307\217\152\104\344\176\130\047\370\013\320\344\224\022\212
\361\033\070\070\057\037\061\234\006\324\054\247\336\013\052\256
\032\240\343\236\152\277\237\074\307\156\242\371\213\144\154\072
\255\205\125\121\124\245\070\125\270\253\203\004\362\077\144\066
\367\300\215\103\103\152\146\321\367\027\052\325\357\066\372\060
\020\102\327\123\315\371\372\063\163\114\263\351\204\040\212\326
\101\047\065\344\070\372\224\233\270\172\344\171\037\063\373\033
\330\041\011\050\174\115\030\151\136\144\212\172\031\223\312\176
\354\363\162\347\067\007\130\131\050\254\102\371\305\377\315\077
\347\245\372\070\261\320\014\307\331\122\032\123\326\201\314\102
\172\065\133\355\113\072\172\366\265\216\314\377\017\174\344\140
\066\207\057\255\360\241\045\175\377\322\113\021\210\160\124\246
\101\250\147\123\122\102\136\344\064\236\344\276\243\354\252\142
\135\335\303\114\246\202\101\344\063\013\254\311\063\017\144\202
\127\052\375\014\255\066\341\014\256\113\305\357\073\231\331\043
\263\133\135\264\127\354\164\160\014\052\117\002\003\001\000\001
\243\201\240\060\201\235\060\014\006\003\125\035\023\004\005\060
\003\001\001\377\060\075\006\003\125\035\037\004\066\060\064\060
\062\240\060\240\056\206\054\150\164\164\160\072\057\057\146\145
\144\151\162\056\143\157\155\163\151\147\156\056\143\157\056\151
\154\057\143\162\154\057\103\157\155\123\151\147\156\103\101\056
\143\162\154\060\016\006\003\125\035\017\001\001\377\004\004\003
\002\001\206\060\037\006\003\125\035\043\004\030\060\026\200\024
\113\001\233\076\126\032\145\066\166\313\173\227\252\222\005\356
\062\347\050\061\060\035\006\003\125\035\016\004\026\004\024\113
\001\233\076\126\032\145\066\166\313\173\227\252\222\005\356\062
\347\050\061\060\015\006\011\052\206\110\206\367\015\001\001\005
\005\000\003\202\001\001\000\320\331\245\176\376\051\140\105\235
\176\203\317\156\274\107\156\365\032\236\124\166\102\161\264\074
\130\077\055\100\045\102\366\201\234\361\211\020\310\016\252\170
\117\070\011\127\260\074\300\010\374\065\216\361\110\121\215\014
\161\164\272\204\304\327\162\233\204\174\070\116\144\006\047\052
\341\247\265\354\010\231\264\012\015\324\205\163\310\022\341\065
\355\361\005\061\035\163\231\014\353\226\312\335\323\346\205\252
\360\212\373\165\301\362\011\074\145\145\144\363\114\330\255\313
\210\151\363\344\203\267\014\275\027\132\226\027\312\133\377\255
\273\034\351\055\204\200\330\041\276\205\122\331\324\164\271\151
\205\272\115\355\050\062\353\371\141\112\344\304\066\036\031\334
\157\204\021\037\225\365\203\050\030\250\063\222\103\047\335\135
\023\004\105\117\207\325\106\315\075\250\272\360\363\270\126\044
\105\353\067\307\341\166\117\162\071\030\337\176\164\162\307\163
\055\071\352\140\346\255\021\242\126\207\173\303\150\232\376\370
\214\160\250\337\145\062\364\244\100\214\241\302\104\003\016\224
\000\147\240\161\000\202\110
END
CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
# Trust for Certificate "ComSign CA"
# Issuer: C=IL,O=ComSign,CN=ComSign CA
# Serial Number:14:13:96:83:14:55:8c:ea:7b:63:e5:fc:34:87:77:44
# Subject: C=IL,O=ComSign,CN=ComSign CA
# Not Valid Before: Wed Mar 24 11:32:18 2004
# Not Valid After : Mon Mar 19 15:02:18 2029
# Fingerprint (MD5): CD:F4:39:F3:B5:18:50:D7:3E:A4:C5:91:A0:3E:21:4B
# Fingerprint (SHA1): E1:A4:5B:14:1A:21:DA:1A:79:F4:1A:42:A9:61:D6:69:CD:06:34:C1
CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "ComSign CA"
CKA_CERT_SHA1_HASH MULTILINE_OCTAL
\341\244\133\024\032\041\332\032\171\364\032\102\251\141\326\151
\315\006\064\301
END
CKA_CERT_MD5_HASH MULTILINE_OCTAL
\315\364\071\363\265\030\120\327\076\244\305\221\240\076\041\113
END
CKA_ISSUER MULTILINE_OCTAL
\060\064\061\023\060\021\006\003\125\004\003\023\012\103\157\155
\123\151\147\156\040\103\101\061\020\060\016\006\003\125\004\012
\023\007\103\157\155\123\151\147\156\061\013\060\011\006\003\125
\004\006\023\002\111\114
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\020\024\023\226\203\024\125\214\352\173\143\345\374\064\207
\167\104
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
# Certificate "Cybertrust Global Root"
#
@@ -19302,7 +19172,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\022\021\040\125\203\344\055\076\124\126\205\055\203\067\267
\054\334\106\021
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
@@ -19408,7 +19278,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\022\021\040\331\221\316\256\243\350\305\347\377\351\002\257
\317\163\274\125
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
@@ -19571,7 +19441,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\022\021\040\263\220\125\071\175\177\066\155\144\302\247\237
\153\143\216\147
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
@@ -19734,7 +19604,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\022\021\040\241\151\033\277\275\271\275\122\226\217\043\350
\110\277\046\021
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
@@ -19844,7 +19714,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\022\021\040\346\370\114\374\044\260\276\005\100\254\332\203
\033\064\140\077
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
@@ -22993,3 +22863,285 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
# Certificate "GlobalSign Root CA - R6"
#
# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6
# Serial Number:45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51
# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6
# Not Valid Before: Wed Dec 10 00:00:00 2014
# Not Valid After : Sun Dec 10 00:00:00 2034
# Fingerprint (SHA-256): 2C:AB:EA:FE:37:D0:6C:A2:2A:BA:73:91:C0:03:3D:25:98:29:52:C4:53:64:73:49:76:3A:3A:B5:AD:6C:CF:69
# Fingerprint (SHA1): 80:94:64:0E:B5:A7:A1:CA:11:9C:1F:DD:D5:9F:81:02:63:A7:FB:D1
CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "GlobalSign Root CA - R6"
CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
CKA_SUBJECT MULTILINE_OCTAL
\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157
\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040
\055\040\122\066\061\023\060\021\006\003\125\004\012\023\012\107
\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125
\004\003\023\012\107\154\157\142\141\154\123\151\147\156
END
CKA_ID UTF8 "0"
CKA_ISSUER MULTILINE_OCTAL
\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157
\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040
\055\040\122\066\061\023\060\021\006\003\125\004\012\023\012\107
\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125
\004\003\023\012\107\154\157\142\141\154\123\151\147\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\016\105\346\273\003\203\063\303\205\145\110\346\377\105\121
END
CKA_VALUE MULTILINE_OCTAL
\060\202\005\203\060\202\003\153\240\003\002\001\002\002\016\105
\346\273\003\203\063\303\205\145\110\346\377\105\121\060\015\006
\011\052\206\110\206\367\015\001\001\014\005\000\060\114\061\040
\060\036\006\003\125\004\013\023\027\107\154\157\142\141\154\123
\151\147\156\040\122\157\157\164\040\103\101\040\055\040\122\066
\061\023\060\021\006\003\125\004\012\023\012\107\154\157\142\141
\154\123\151\147\156\061\023\060\021\006\003\125\004\003\023\012
\107\154\157\142\141\154\123\151\147\156\060\036\027\015\061\064
\061\062\061\060\060\060\060\060\060\060\132\027\015\063\064\061
\062\061\060\060\060\060\060\060\060\132\060\114\061\040\060\036
\006\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147
\156\040\122\157\157\164\040\103\101\040\055\040\122\066\061\023
\060\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123
\151\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154
\157\142\141\154\123\151\147\156\060\202\002\042\060\015\006\011
\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000
\060\202\002\012\002\202\002\001\000\225\007\350\163\312\146\371
\354\024\312\173\074\367\015\010\361\264\105\013\054\202\264\110
\306\353\133\074\256\203\270\101\222\063\024\244\157\177\351\052
\314\306\260\210\153\305\266\211\321\306\262\377\024\316\121\024
\041\354\112\335\033\132\306\326\207\356\115\072\025\006\355\144
\146\013\222\200\312\104\336\163\224\116\363\247\211\177\117\170
\143\010\310\022\120\155\102\146\057\115\271\171\050\115\122\032
\212\032\200\267\031\201\016\176\304\212\274\144\114\041\034\103
\150\327\075\074\212\305\262\146\325\220\232\267\061\006\305\276
\342\155\062\006\246\036\371\271\353\252\243\270\277\276\202\143
\120\320\360\030\211\337\344\017\171\365\352\242\037\052\322\160
\056\173\347\274\223\273\155\123\342\110\174\214\020\007\070\377
\146\262\167\141\176\340\352\214\074\252\264\244\366\363\225\112
\022\007\155\375\214\262\211\317\320\240\141\167\310\130\164\260
\324\043\072\367\135\072\312\242\333\235\011\336\135\104\055\220
\361\201\315\127\222\372\176\274\120\004\143\064\337\153\223\030
\276\153\066\262\071\344\254\044\066\267\360\357\266\034\023\127
\223\266\336\262\370\342\205\267\163\242\270\065\252\105\362\340
\235\066\241\157\124\212\361\162\126\156\056\210\305\121\102\104
\025\224\356\243\305\070\226\233\116\116\132\013\107\363\006\066
\111\167\060\274\161\067\345\246\354\041\010\165\374\346\141\026
\077\167\325\331\221\227\204\012\154\324\002\115\164\300\024\355
\375\071\373\203\362\136\024\241\004\260\013\351\376\356\217\341
\156\013\262\010\263\141\146\011\152\261\006\072\145\226\131\300
\360\065\375\311\332\050\215\032\021\207\160\201\012\250\232\165
\035\236\072\206\005\000\236\333\200\326\045\371\334\005\236\047
\131\114\166\071\133\352\371\245\241\330\203\017\321\377\337\060
\021\371\205\317\063\110\365\312\155\144\024\054\172\130\117\323
\113\010\111\305\225\144\032\143\016\171\075\365\263\214\312\130
\255\234\102\105\171\156\016\207\031\134\124\261\145\266\277\214
\233\334\023\351\015\157\270\056\334\147\156\311\213\021\265\204
\024\212\000\031\160\203\171\221\227\221\324\032\047\277\067\036
\062\007\330\024\143\074\050\114\257\002\003\001\000\001\243\143
\060\141\060\016\006\003\125\035\017\001\001\377\004\004\003\002
\001\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003
\001\001\377\060\035\006\003\125\035\016\004\026\004\024\256\154
\005\243\223\023\342\242\347\342\327\034\326\307\360\177\310\147
\123\240\060\037\006\003\125\035\043\004\030\060\026\200\024\256
\154\005\243\223\023\342\242\347\342\327\034\326\307\360\177\310
\147\123\240\060\015\006\011\052\206\110\206\367\015\001\001\014
\005\000\003\202\002\001\000\203\045\355\350\321\375\225\122\315
\236\300\004\240\221\151\346\134\320\204\336\334\255\242\117\350
\107\170\326\145\230\251\133\250\074\207\174\002\212\321\156\267
\026\163\346\137\300\124\230\325\164\276\301\315\342\021\221\255
\043\030\075\335\341\162\104\226\264\225\136\300\173\216\231\170
\026\103\023\126\127\263\242\263\073\265\167\334\100\162\254\243
\353\233\065\076\261\010\041\241\347\304\103\067\171\062\276\265
\347\234\054\114\274\103\051\231\216\060\323\254\041\340\343\035
\372\330\007\063\166\124\000\042\052\271\115\040\056\160\150\332
\345\123\374\203\134\323\235\362\377\104\014\104\146\362\322\343
\275\106\000\032\155\002\272\045\135\215\241\061\121\335\124\106
\034\115\333\231\226\357\032\034\004\134\246\025\357\170\340\171
\376\135\333\076\252\114\125\375\232\025\251\157\341\246\373\337
\160\060\351\303\356\102\106\355\302\223\005\211\372\175\143\173
\077\320\161\201\174\000\350\230\256\016\170\064\303\045\373\257
\012\237\040\153\335\073\023\217\022\214\342\101\032\110\172\163
\240\167\151\307\266\134\177\202\310\036\376\130\033\050\053\250
\154\255\136\155\300\005\322\173\267\353\200\376\045\067\376\002
\233\150\254\102\135\303\356\365\314\334\360\120\165\322\066\151
\234\346\173\004\337\156\006\151\266\336\012\011\110\131\207\353
\173\024\140\172\144\252\151\103\357\221\307\114\354\030\335\154
\357\123\055\214\231\341\136\362\162\076\317\124\310\275\147\354
\244\017\114\105\377\323\271\060\043\007\114\217\020\277\206\226
\331\231\132\264\231\127\034\244\314\273\025\211\123\272\054\005
\017\344\304\236\031\261\030\064\325\114\235\272\355\367\037\257
\044\225\004\170\250\003\273\356\201\345\332\137\174\213\112\241
\220\164\045\247\263\076\113\310\054\126\275\307\310\357\070\342
\134\222\360\171\367\234\204\272\164\055\141\001\040\176\176\321
\362\117\007\131\137\213\055\103\122\353\106\014\224\341\365\146
\107\171\167\325\124\133\037\255\044\067\313\105\132\116\240\104
\110\310\330\260\231\305\025\204\011\366\326\111\111\300\145\270
\346\032\161\156\240\250\361\202\350\105\076\154\326\002\327\012
\147\203\005\132\311\244\020
END
CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
# Trust for "GlobalSign Root CA - R6"
# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6
# Serial Number:45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51
# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign Root CA - R6
# Not Valid Before: Wed Dec 10 00:00:00 2014
# Not Valid After : Sun Dec 10 00:00:00 2034
# Fingerprint (SHA-256): 2C:AB:EA:FE:37:D0:6C:A2:2A:BA:73:91:C0:03:3D:25:98:29:52:C4:53:64:73:49:76:3A:3A:B5:AD:6C:CF:69
# Fingerprint (SHA1): 80:94:64:0E:B5:A7:A1:CA:11:9C:1F:DD:D5:9F:81:02:63:A7:FB:D1
CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "GlobalSign Root CA - R6"
CKA_CERT_SHA1_HASH MULTILINE_OCTAL
\200\224\144\016\265\247\241\312\021\234\037\335\325\237\201\002
\143\247\373\321
END
CKA_CERT_MD5_HASH MULTILINE_OCTAL
\117\335\007\344\324\042\144\071\036\014\067\102\352\321\306\256
END
CKA_ISSUER MULTILINE_OCTAL
\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157
\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040
\055\040\122\066\061\023\060\021\006\003\125\004\012\023\012\107
\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125
\004\003\023\012\107\154\157\142\141\154\123\151\147\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\016\105\346\273\003\203\063\303\205\145\110\346\377\105\121
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
# Certificate "OISTE WISeKey Global Root GC CA"
#
# Issuer: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
# Serial Number:21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea
# Subject: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
# Not Valid Before: Tue May 09 09:48:34 2017
# Not Valid After : Fri May 09 09:58:33 2042
# Fingerprint (SHA-256): 85:60:F9:1C:36:24:DA:BA:95:70:B5:FE:A0:DB:E3:6F:F1:1A:83:23:BE:94:86:85:4F:B3:F3:4A:55:71:19:8D
# Fingerprint (SHA1): E0:11:84:5E:34:DE:BE:88:81:B9:9C:F6:16:26:D1:96:1F:C3:B9:31
CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "OISTE WISeKey Global Root GC CA"
CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
CKA_SUBJECT MULTILINE_OCTAL
\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061
\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145
\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124
\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144
\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037
\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154
\157\142\141\154\040\122\157\157\164\040\107\103\040\103\101
END
CKA_ID UTF8 "0"
CKA_ISSUER MULTILINE_OCTAL
\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061
\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145
\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124
\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144
\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037
\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154
\157\142\141\154\040\122\157\157\164\040\107\103\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\020\041\052\126\014\256\332\014\253\100\105\277\053\242\055
\072\352
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\151\060\202\001\357\240\003\002\001\002\002\020\041
\052\126\014\256\332\014\253\100\105\277\053\242\055\072\352\060
\012\006\010\052\206\110\316\075\004\003\003\060\155\061\013\060
\011\006\003\125\004\006\023\002\103\110\061\020\060\016\006\003
\125\004\012\023\007\127\111\123\145\113\145\171\061\042\060\040
\006\003\125\004\013\023\031\117\111\123\124\105\040\106\157\165
\156\144\141\164\151\157\156\040\105\156\144\157\162\163\145\144
\061\050\060\046\006\003\125\004\003\023\037\117\111\123\124\105
\040\127\111\123\145\113\145\171\040\107\154\157\142\141\154\040
\122\157\157\164\040\107\103\040\103\101\060\036\027\015\061\067
\060\065\060\071\060\071\064\070\063\064\132\027\015\064\062\060
\065\060\071\060\071\065\070\063\063\132\060\155\061\013\060\011
\006\003\125\004\006\023\002\103\110\061\020\060\016\006\003\125
\004\012\023\007\127\111\123\145\113\145\171\061\042\060\040\006
\003\125\004\013\023\031\117\111\123\124\105\040\106\157\165\156
\144\141\164\151\157\156\040\105\156\144\157\162\163\145\144\061
\050\060\046\006\003\125\004\003\023\037\117\111\123\124\105\040
\127\111\123\145\113\145\171\040\107\154\157\142\141\154\040\122
\157\157\164\040\107\103\040\103\101\060\166\060\020\006\007\052
\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000
\004\114\351\120\300\306\017\162\030\274\330\361\272\263\211\342
\171\112\243\026\247\153\124\044\333\121\377\352\364\011\044\303
\013\042\237\313\152\047\202\201\015\322\300\257\061\344\164\202
\156\312\045\331\214\165\235\361\333\320\232\242\113\041\176\026
\247\143\220\322\071\324\261\207\170\137\030\226\017\120\033\065
\067\017\152\306\334\331\023\115\244\216\220\067\346\275\133\061
\221\243\124\060\122\060\016\006\003\125\035\017\001\001\377\004
\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377\004
\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
\024\110\207\024\254\343\303\236\220\140\072\327\312\211\356\323
\255\214\264\120\146\060\020\006\011\053\006\001\004\001\202\067
\025\001\004\003\002\001\000\060\012\006\010\052\206\110\316\075
\004\003\003\003\150\000\060\145\002\060\046\307\151\133\334\325
\347\262\347\310\014\214\214\303\335\171\214\033\143\325\311\122
\224\116\115\202\112\163\036\262\200\204\251\045\300\114\132\155
\111\051\140\170\023\342\176\110\353\144\002\061\000\333\064\040
\062\010\377\232\111\002\266\210\336\024\257\135\154\231\161\215
\032\077\213\327\340\242\066\206\034\007\202\072\166\123\375\302
\242\355\357\173\260\200\117\130\017\113\123\071\275
END
CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
# Trust for "OISTE WISeKey Global Root GC CA"
# Issuer: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
# Serial Number:21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea
# Subject: CN=OISTE WISeKey Global Root GC CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
# Not Valid Before: Tue May 09 09:48:34 2017
# Not Valid After : Fri May 09 09:58:33 2042
# Fingerprint (SHA-256): 85:60:F9:1C:36:24:DA:BA:95:70:B5:FE:A0:DB:E3:6F:F1:1A:83:23:BE:94:86:85:4F:B3:F3:4A:55:71:19:8D
# Fingerprint (SHA1): E0:11:84:5E:34:DE:BE:88:81:B9:9C:F6:16:26:D1:96:1F:C3:B9:31
CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "OISTE WISeKey Global Root GC CA"
CKA_CERT_SHA1_HASH MULTILINE_OCTAL
\340\021\204\136\064\336\276\210\201\271\234\366\026\046\321\226
\037\303\271\061
END
CKA_CERT_MD5_HASH MULTILINE_OCTAL
\251\326\271\055\057\223\144\370\245\151\312\221\351\150\007\043
END
CKA_ISSUER MULTILINE_OCTAL
\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061
\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145
\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124
\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144
\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037
\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154
\157\142\141\154\040\122\157\157\164\040\107\103\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\020\041\052\126\014\256\332\014\253\100\105\277\053\242\055
\072\352
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE

2
config/etc/sysctl.conf
View File

@@ -44,7 +44,7 @@ net.bridge.bridge-nf-call-iptables = 0
net.bridge.bridge-nf-call-arptables = 0
# Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc).
kernel.kptr_restrict = 1
kernel.kptr_restrict = 2
# Avoid kernel memory address exposures via dmesg.
kernel.dmesg_restrict = 1

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.50-ipfire Kernel Configuration
# Linux/arm64 4.14.71 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -509,6 +509,7 @@ CONFIG_SCHED_SMT=y
CONFIG_NR_CPUS=8
CONFIG_HOTPLUG_CPU=y
# CONFIG_NUMA is not set
CONFIG_HOLES_IN_ZONE=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
@@ -574,6 +575,7 @@ CONFIG_CRASH_DUMP=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_ARM64_SSBD=y
CONFIG_ARMV8_DEPRECATED=y
CONFIG_SWP_EMULATION=y
CONFIG_CP15_BARRIER_EMULATION=y
@@ -1087,6 +1089,9 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1094,10 +1099,7 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1353,7 +1355,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -2415,6 +2416,7 @@ CONFIG_WLAN=y
# CONFIG_WIRELESS_WDS is not set
CONFIG_WLAN_VENDOR_ADMTEK=y
CONFIG_ADM8211=m
# CONFIG_RTL8189ES is not set
CONFIG_ATH_COMMON=m
CONFIG_WLAN_VENDOR_ATH=y
# CONFIG_ATH_DEBUG is not set
@@ -2625,6 +2627,7 @@ CONFIG_WL18XX=m
CONFIG_WLCORE=m
CONFIG_WLCORE_SDIO=m
CONFIG_WILINK_PLATFORM_DATA=y
# CONFIG_WLAN_VENDOR_XRADIO is not set
CONFIG_WLAN_VENDOR_ZYDAS=y
CONFIG_USB_ZD1201=m
CONFIG_ZD1211RW=m
@@ -3594,6 +3597,7 @@ CONFIG_REGULATOR_PFUZE100=y
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
# CONFIG_REGULATOR_PWM is not set
# CONFIG_REGULATOR_SY8106A is not set
# CONFIG_REGULATOR_TPS51632 is not set
# CONFIG_REGULATOR_TPS62360 is not set
# CONFIG_REGULATOR_TPS65023 is not set
@@ -4246,6 +4250,7 @@ CONFIG_DRM_UDL=m
# CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_CIRRUS_QEMU is not set
CONFIG_DRM_RCAR_DW_HDMI=m
# CONFIG_DRM_SUN4I is not set
# CONFIG_DRM_QXL is not set
# CONFIG_DRM_BOCHS is not set
CONFIG_DRM_VIRTIO_GPU=m
@@ -6636,7 +6641,7 @@ CONFIG_CRYPTO_ENGINE=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -6667,7 +6672,7 @@ CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
# CONFIG_CRYPTO_POLY1305 is not set
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -6699,7 +6704,7 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
# CONFIG_CRYPTO_CHACHA20 is not set
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.43 Kernel Configuration
# Linux/arm 4.14.71 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1075,6 +1075,9 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1082,10 +1085,7 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1334,7 +1334,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -6058,7 +6057,7 @@ CONFIG_CRYPTO_TEST=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -6089,7 +6088,7 @@ CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
# CONFIG_CRYPTO_POLY1305 is not set
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -6121,7 +6120,7 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
# CONFIG_CRYPTO_CHACHA20 is not set
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.43 Kernel Configuration
# Linux/arm 4.14.71 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1344,6 +1344,9 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1351,10 +1354,7 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1609,7 +1609,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -5879,7 +5878,6 @@ CONFIG_DMA_ENGINE_RAID=y
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_ARM_CHARLCD=y
# CONFIG_PANEL is not set
CONFIG_UIO=m
# CONFIG_UIO_CIF is not set
@@ -7128,7 +7126,7 @@ CONFIG_CRYPTO_ENGINE=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -7159,7 +7157,7 @@ CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_GHASH=m
# CONFIG_CRYPTO_POLY1305 is not set
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -7191,7 +7189,7 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
# CONFIG_CRYPTO_CHACHA20 is not set
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.43 Kernel Configuration
# Linux/x86 4.14.71 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -236,6 +236,7 @@ CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HOTPLUG_SMT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
# CONFIG_KPROBES is not set
@@ -270,6 +271,7 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_RCU_TABLE_FREE=y
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -1281,6 +1283,9 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1288,10 +1293,7 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1547,7 +1549,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -6869,7 +6870,6 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_SALSA20_586=m
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.43 Kernel Configuration
# Linux/x86 4.14.71 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -236,6 +236,7 @@ CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HOTPLUG_SMT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
# CONFIG_KPROBES is not set
@@ -270,6 +271,7 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_RCU_TABLE_FREE=y
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -1299,6 +1301,9 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1306,10 +1311,7 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1565,7 +1567,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -6875,7 +6876,6 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_SALSA20_586=m
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m

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

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.43 Kernel Configuration
# Linux/x86 4.14.71 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -245,6 +245,7 @@ CONFIG_SLUB_CPU_PARTIAL=y
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
# CONFIG_PROFILING is not set
CONFIG_TRACEPOINTS=y
CONFIG_HOTPLUG_SMT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
# CONFIG_KPROBES is not set
@@ -279,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_RCU_TABLE_FREE=y
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -1273,6 +1275,9 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1280,10 +1285,7 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1540,7 +1542,6 @@ CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_AG6XX=y
@@ -6749,7 +6750,6 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_X86_64=m
CONFIG_CRYPTO_SEED=m

3
config/rootfiles/common/aarch64/linux
View File

@@ -99,6 +99,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire/kernel/crypto/ccm.ko
#lib/modules/KVER-ipfire/kernel/crypto/chacha20_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko
#lib/modules/KVER-ipfire/kernel/crypto/cts.ko
@@ -118,6 +120,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire/kernel/crypto/pcrypt.ko
#lib/modules/KVER-ipfire/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko

5
config/rootfiles/common/armv5tel/linux-kirkwood
View File

@@ -117,6 +117,8 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ccm.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20_generic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cts.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/deflate.ko
@@ -134,6 +136,7 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/md4.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd256.ko
@@ -1063,7 +1066,6 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/b53/b53_mdio.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/bcm-sf2.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dsa/lan9303_mdio.ko
@@ -2003,7 +2005,6 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_bitmap.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_hash.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nft_set_rbtree.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_AUDIT.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CHECKSUM.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CLASSIFY.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CONNSECMARK.ko

4
config/rootfiles/common/armv5tel/linux-multi
View File

@@ -521,6 +521,8 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/ccm.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20_generic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/crypto_engine.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/cts.ko
@@ -540,6 +542,7 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/pcrypt.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire-multi/kernel/crypto/rmd256.ko
@@ -1614,7 +1617,6 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/b53/b53_mdio.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/bcm-sf2.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/dsa/lan9303_mdio.ko

2
config/rootfiles/common/i586/linux
View File

@@ -11,7 +11,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crc32-pclmul.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/glue_helper.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-i586.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-i586.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-i586.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/events
@@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko

3
config/rootfiles/common/iproute2
View File

@@ -65,6 +65,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/devlink-dev.8
#usr/share/man/man8/devlink-monitor.8
#usr/share/man/man8/devlink-port.8
#usr/share/man/man8/devlink-resource.8
#usr/share/man/man8/devlink-sb.8
#usr/share/man/man8/devlink.8
#usr/share/man/man8/genl.8
@@ -97,6 +98,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/nstat.8
#usr/share/man/man8/rdma-dev.8
#usr/share/man/man8/rdma-link.8
#usr/share/man/man8/rdma-resource.8
#usr/share/man/man8/rdma.8
#usr/share/man/man8/routef.8
#usr/share/man/man8/routel.8
@@ -111,6 +113,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/tc-bpf.8
#usr/share/man/man8/tc-cbq-details.8
#usr/share/man/man8/tc-cbq.8
#usr/share/man/man8/tc-cbs.8
#usr/share/man/man8/tc-cgroup.8
#usr/share/man/man8/tc-choke.8
#usr/share/man/man8/tc-codel.8

4
config/rootfiles/common/unbound
View File

@@ -10,8 +10,8 @@ etc/unbound/unbound.conf
#usr/include/unbound.h
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.2
usr/lib/libunbound.so.2.5.11
usr/lib/libunbound.so.8
usr/lib/libunbound.so.8.0.0
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor

2
config/rootfiles/common/x86_64/linux
View File

@@ -22,7 +22,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/des3_ede-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/ghash-clmulni-intel.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/poly1305-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx-x86_64.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-avx2.ko
#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/serpent-sse2-x86_64.ko
@@ -1474,7 +1473,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_mmap.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/b53/b53_srab.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/dsa/lan9303_mdio.ko

2
config/rootfiles/core/124/exclude
View File

@@ -11,8 +11,6 @@ etc/ipsec.user.secrets
etc/localtime
etc/shadow
etc/snort/snort.conf
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
etc/sudoers
etc/sysconfig/firewall.local

2
config/rootfiles/core/124/filelists/aarch64/files Normal file
View File

@@ -0,0 +1,2 @@
boot/boot.cmd
boot/boot.scr

1
config/rootfiles/core/124/filelists/aarch64/linux Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/aarch64/linux

1
config/rootfiles/core/124/filelists/aarch64/linux-initrd Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/aarch64/linux-initrd

2
config/rootfiles/core/124/filelists/armv5tel/files Normal file
View File

@@ -0,0 +1,2 @@
boot/boot.cmd
boot/boot.scr

1
config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-initrd-kirkwood

1
config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-initrd-multi

1
config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-kirkwood

1
config/rootfiles/core/124/filelists/armv5tel/linux-multi Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-multi

1
config/rootfiles/core/124/filelists/ca-certificates Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ca-certificates

16
config/rootfiles/core/124/filelists/files
View File

@@ -3,11 +3,27 @@ etc/issue
etc/rc.d/helper/aws-setup
etc/rc.d/init.d/aws
etc/rc.d/init.d/localnet
etc/rc.d/init.d/networking/red.down/10-static-routes
etc/rc.d/init.d/partresize
etc/rc.d/init.d/static-routes
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/sysctl.conf
etc/unbound/unbound.conf
opt/pakfire/lib/functions.pl
opt/pakfire/pakfire
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/redirect-templates/legacy/template.html
usr/bin/install-bootloader
usr/local/bin/backupiso
usr/local/bin/rebuild-initrd
var/ipfire/backup/bin/backup.pl
var/ipfire/backup/exclude
var/ipfire/backup/include
var/ipfire/langs

1
config/rootfiles/core/124/filelists/i586/linux Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/i586/linux

1
config/rootfiles/core/124/filelists/i586/linux-initrd Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/i586/linux-initrd

1
config/rootfiles/core/124/filelists/iproute2 Symbolic link
View File

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

1
config/rootfiles/core/124/filelists/ntp Symbolic link
View File

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

1
config/rootfiles/core/124/filelists/openssh Symbolic link
View File

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

1
config/rootfiles/core/124/filelists/rng-tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/rng-tools

1
config/rootfiles/core/124/filelists/unbound Symbolic link
View File

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

1
config/rootfiles/core/124/filelists/x86_64/linux Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/x86_64/linux

1
config/rootfiles/core/124/filelists/x86_64/linux-initrd Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/x86_64/linux-initrd

96
config/rootfiles/core/124/update.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2017 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2018 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
@@ -26,11 +26,59 @@
core=124
exit_with_error() {
# Set last succesfull installed core.
echo $(($core-1)) > /opt/pakfire/db/core/mine
# don't start pakfire again at error
killall -KILL pak_update
/usr/bin/logger -p syslog.emerg -t ipfire \
"core-update-${core}: $1"
exit $2
}
# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ )); do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
KVER="xxxKVERxxx"
# Backup uEnv.txt if exist
if [ -e /boot/uEnv.txt ]; then
cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
fi
# Do some sanity checks.
case $(uname -r) in
*-ipfire*)
# Ok.
;;
*)
exit_with_error "ERROR cannot update. No IPFire Kernel." 1
;;
esac
# Check diskspace on root
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
if [ $ROOTSPACE -lt 80000 ]; then
exit_with_error "ERROR cannot update because not enough free space on root." 2
exit 2
fi
# Remove the old kernel
rm -rf /boot/System.map-*
rm -rf /boot/config-*
rm -rf /boot/ipfirerd-*
rm -rf /boot/initramfs-*
rm -rf /boot/vmlinuz-*
rm -rf /boot/uImage-ipfire-*
rm -rf /boot/zImage-ipfire-*
rm -rf /boot/uInit-ipfire-*
rm -rf /boot/dtb-*-ipfire-*
rm -rf /lib/modules
rm -f /etc/sysconfig/lm_sensors
# Stop services
# Remove files
@@ -47,7 +95,19 @@ ldconfig
# Update Language cache
/usr/local/bin/update-lang-cache
# Apply local configuration to sshd_config
/usr/local/bin/sshctrl
# Start services
/etc/init.d/rngd restart
/etc/init.d/ntp restart
/etc/init.d/unbound restart
# Reload sysctl.conf
sysctl -p
# rebuild initrd to add early microcode updates
rebuild-initrd
# Remove deprecated GRUB configuration option
if [ -e "/etc/default/grub" ]; then
@@ -57,8 +117,39 @@ fi
# Update bootloader
/usr/bin/install-bootloader
# Upadate Kernel version uEnv.txt
if [ -e /boot/uEnv.txt ]; then
sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
fi
# call user update script (needed for some arm boards)
if [ -e /boot/pakfire-kernel-update ]; then
/boot/pakfire-kernel-update ${KVER}
fi
case "$(uname -m)" in
i?86)
# Force (re)install pae kernel if pae is supported
rm -rf /opt/pakfire/db/installed/meta-linux-pae
if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
/usr/bin/logger -p syslog.emerg -t ipfire \
"core-update-${core}: WARNING not enough space for pae kernel."
else
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
fi
fi
;;
esac
# This update needs a reboot...
touch /var/run/need_reboot
if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then
touch /var/run/need_reboot
fi
# Finish
/etc/init.d/fireinfo start
@@ -73,4 +164,3 @@ sync
# Don't report the exitcode last command
exit 0

2
config/rootfiles/oldcore/123/filelists/files
View File

@@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/local/bin/backupiso
usr/lib/libssp.so.0
usr/lib/libssp.so.0.0.0
usr/sbin/dhclient
usr/share/GeoIP/GeoIP.dat
var/ipfire/backup/bin/backup.pl

1
config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/i586/openssl-sse2

1
config/rootfiles/oldcore/123/filelists/xtables-addons Symbolic link
View File

@@ -0,0 +1 @@
../../../common/xtables-addons

3
config/rootfiles/oldcore/123/update.sh
View File

@@ -34,6 +34,9 @@ done
# Stop services
/etc/init.d/squid stop
# remove old xtables modules / some are renamend
rm -rf /lib/xtables
# Extract files
extract_files

2
config/rootfiles/packages/linux-pae
View File

@@ -10,7 +10,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/crc32-pclmul.ko
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/glue_helper.ko
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/salsa20-i586.ko
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/serpent-sse2-i586.ko
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/twofish-i586.ko
#lib/modules/KVER-ipfire-pae/kernel/arch/x86/events
@@ -1471,7 +1470,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/b53/b53_mmap.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/b53/b53_srab.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/dsa_loop.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/dsa_loop_bdinfo.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303-core.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303_i2c.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dsa/lan9303_mdio.ko

33
config/ssh/ssh_config Normal file
View File

@@ -0,0 +1,33 @@
# OpenSSH client configuration
#
# set some basic hardening options for all connections
Host *
# disable Roaming as it is known to be vulnerable
UseRoaming no
# only use secure crypto algorithm
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
# always visualise server host keys (has no technical
# effect, but helps to identify key based MITM attacks)
VisualHostKey yes
# use SSHFP (might work on some up-to-date networks) to look up host keys
VerifyHostKeyDNS yes
# send keep-alive messages to connected server to avoid broken connections
ServerAliveInterval 10
ServerAliveCountMax 6
# disable X11 forwarding (security risk)
ForwardX11 no
# always check server IP address
CheckHostIP yes
# ensure only allowed authentication methods are used
PreferredAuthentications publickey,keyboard-interactive,password
# EOF

78
config/ssh/sshd_config Normal file
View File

@@ -0,0 +1,78 @@
# ultra-secure OpenSSH server configuration
# only allow version 2 of SSH protocol
Protocol 2
# listen on port 22 by default
Port 22
# listen on these interfaces and protocols
AddressFamily any
ListenAddress 0.0.0.0
# limit authentication thresholds
LoginGraceTime 30s
MaxAuthTries 6
# limit maximum instanctes to prevent DoS
MaxStartups 5
# ensure proper logging
SyslogFacility AUTH
LogLevel INFO
# enforce permission checks before a login is accepted
# (prevents damage because of hacked systems with world-writeable
# home directories or similar)
StrictModes yes
# only allow safe crypto algorithms (may break some _very_ outdated clients)
# see also: https://stribika.github.io/2015/01/04/secure-secure-shell.html
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
# enable data compression after successful login only
Compression delayed
# only allow cryptographically safe SSH host keys (adjust paths if needed)
HostKey /etc/ssh/ssh_host_ed25519_key
HostKey /etc/ssh/ssh_host_ecdsa_key
HostKey /etc/ssh/ssh_host_rsa_key
# only allow login via public key by default
PubkeyAuthentication yes
PasswordAuthentication no
ChallengeResponseAuthentication no
PermitEmptyPasswords no
# permit root login as there is no other user in IPFire 2.x
PermitRootLogin yes
# ignore user ~/.rhost* files
IgnoreRhosts yes
# ignore user known hosts file
IgnoreUserKnownHosts yes
# ignore user environments
PermitUserEnvironment no
# do not allow any kind of forwarding (provides only low security)
# some of them might need to be re-enabled if SSH server is a jump platform
X11Forwarding no
AllowTcpForwarding no
AllowAgentForwarding no
PermitTunnel no
GatewayPorts no
PermitOpen none
# detect broken sessions by sending keep-alive messages to
# clients (both via TCP and SSH)
TCPKeepAlive yes
ClientAliveInterval 10
# close unresponsive SSH sessions which fail to answer keep-alive
ClientAliveCountMax 6
# EOF

8
config/u-boot/boot.cmd
View File

@@ -73,6 +73,14 @@ fi;
setenv fdt_high ffffffff;
fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
if test "${FDTCMDS}" = ""; then
echo ;
else
fdt addr ${fdt_addr_r};
run FDTCMDS;
fi;
setenv ramdisk_addr ${ramdisk_addr_r}
if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
echo Ramdisk loaded...;

BIN
config/u-boot/boot.scr
View File

Binary file not shown.

6
config/unbound/unbound.conf
View File

@@ -59,7 +59,11 @@ server:
harden-below-nxdomain: yes
harden-referral-path: yes
harden-algo-downgrade: no
use-caps-for-id: no
use-caps-for-id: yes
aggressive-nsec: yes
# Harden against DNS cache poisoning
unwanted-reply-threshold: 1000000
# Listen on all interfaces
interface-automatic: yes

109
html/cgi-bin/backup.cgi
View File

@@ -24,6 +24,7 @@ use strict;
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
use File::Copy;
use File::Basename;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
@@ -58,44 +59,25 @@ system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/
############################################################################################################################
############################################## System calls ohne Http Header ###############################################
# Replace slashes from filename
$cgiparams{'FILE'} =~ s/\///;
if ($cgiparams{'ACTION'} eq "download") {
my $file = &sanitise_file($cgiparams{'FILE'});
exit(1) unless defined($file);
if ( $cgiparams{'ACTION'} eq "download" )
{
open(DLFILE, "</var/ipfire/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
my @fileholder = <DLFILE>;
print "Content-Type:application/x-download\n";
my @fileinfo = stat("/var/ipfire/backup/$cgiparams{'FILE'}");
print "Content-Length:$fileinfo[7]\n";
print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
print @fileholder;
exit (0);
}
if ( $cgiparams{'ACTION'} eq "downloadiso" )
{
open(DLFILE, "</var/tmp/backupiso/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
my @fileholder = <DLFILE>;
print "Content-Type:application/x-download\n";
my @fileinfo = stat("/var/tmp/backupiso/$cgiparams{'FILE'}");
print "Content-Length:$fileinfo[7]\n";
print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
print @fileholder;
exit (0);
}
if ( $cgiparams{'ACTION'} eq "downloadaddon" )
{
open(DLFILE, "</var/ipfire/backup/addons/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
my @fileholder = <DLFILE>;
print "Content-Type:application/x-download\n";
my @fileinfo = stat("/var/ipfire/backup/addons/backup/$cgiparams{'FILE'}");
print "Content-Length:$fileinfo[7]\n";
print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
print @fileholder;
exit (0);
}
elsif ( $cgiparams{'ACTION'} eq "restore" )
{
&deliver_file($file);
exit(0);
} elsif ($cgiparams{'ACTION'} eq "downloadiso") {
my $file = &sanitise_file($cgiparams{'FILE'});
exit(1) unless defined($file);
&deliver_file($file);
exit(0);
} elsif ($cgiparams{'ACTION'} eq "downloadaddon") {
my $file = &sanitise_file($cgiparams{'FILE'});
exit(1) unless defined($file);
&deliver_file($file);
exit(0);
} elsif ( $cgiparams{'ACTION'} eq "restore") {
my $upload = $a->param("UPLOAD");
open UPLOADFILE, ">/tmp/restore.ipf";
binmode $upload;
@@ -142,11 +124,20 @@ if ( $cgiparams{'ACTION'} eq "backup" )
}
if ( $cgiparams{'ACTION'} eq "addonbackup" )
{
# Exit if there is any dots or slashes in the addon name
exit(1) if ($cgiparams{'ADDON'} =~ /(\.|\/)/);
# Check if the addon exists
exit(1) unless (-e "/var/ipfire/backup/addons/includes/$cgiparams{'ADDON'}");
system("/usr/local/bin/backupctrl addonbackup $cgiparams{'ADDON'} >/dev/null 2>&1");
}
elsif ( $cgiparams{'ACTION'} eq "delete" )
{
system("/usr/local/bin/backupctrl $cgiparams{'FILE'} >/dev/null 2>&1");
my $file = &sanitise_file($cgiparams{'FILE'});
exit(1) unless defined($file);
system("/usr/local/bin/backupctrl $file >/dev/null 2>&1");
}
############################################################################################################################
@@ -273,7 +264,7 @@ print <<END
<td align='right' width='5'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='delete' />
<input type='hidden' name='FILE' value='addons//backup/$_.ipf' />
<input type='hidden' name='FILE' value='$_.ipf' />
<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
</form>
</td>
@@ -312,7 +303,7 @@ print <<END
<td align='right' width='5'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='delete' />
<input type='hidden' name='FILE' value='addons//backup/$_.ipf' />
<input type='hidden' name='FILE' value='$_.ipf' />
<input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
</form>
</td>
@@ -340,3 +331,41 @@ END
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
sub sanitise_file() {
my $file = shift;
# Filenames cannot contain any slashes
return undef if ($file =~ /\//);
# File must end with .ipf or .iso
return undef unless ($file =~ /\.(ipf|iso)$/);
# Convert to absolute path
if (-e "/var/ipfire/backup/$file") {
return "/var/ipfire/backup/$file";
} elsif (-e "/var/ipfire/backup/addons/backup/$file") {
return "/var/ipfire/backup/addons/backup/$file";
} elsif (-e "/var/tmp/backupiso/$file") {
return "/var/tmp/backupiso/$file";
}
# File does not seem to exist
return undef;
}
sub deliver_file() {
my $file = shift;
my @stat = stat($file);
# Print headers
print "Content-Disposition: attachment; filename=" . &File::Basename::basename($file) . "\n";
print "Content-Type: application/octet-stream\n";
print "Content-Length: $stat[7]\n";
print "\n";
# Deliver content
open(FILE, "<$file") or die "Unable to open $file: $!";
print <FILE>;
close(FILE);
}

2
html/cgi-bin/fwhosts.cgi
View File

@@ -1258,6 +1258,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpname')
}
&General::writehasharray("$configgrp", \%customgrp );
#change name in FW Rules
&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4);
&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6);
}
}
@@ -1282,6 +1283,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname')
&General::writehasharray("$configgeoipgrp", \%customgeoipgrp );
#change name in FW Rules
&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,"geoip");
&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6,"geoip");
}
}
&addgeoipgrp;

7
html/cgi-bin/index.cgi
View File

@@ -465,6 +465,10 @@ END
my $activecolor = $Header::colourred;
my $activestatus = $Lang::tr{'capsclosed'};
if ($vpnconfig{$key}[33] eq "add") {
$activecolor = ${Header::colourorange};
$activestatus = $Lang::tr{'vpn wait'};
}
if ($vpnconfig{$key}[0] eq 'off') {
$activecolor = $Header::colourblue;
$activestatus = $Lang::tr{'capsclosed'};
@@ -479,9 +483,6 @@ END
} elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
$activecolor = $Header::colourorange;
$activestatus = $Lang::tr{'vpn on-demand'};
} elsif ($vpnconfig{$key}[33] eq "add") {
$activecolor = ${Header::colourorange};
$activestatus = $Lang::tr{'vpn wait'};
}
}
}

11
html/cgi-bin/pakfire.cgi
View File

@@ -43,7 +43,6 @@ $pakfiresettings{'VALID'} = '';
$pakfiresettings{'INSPAKS'} = '';
$pakfiresettings{'DELPAKS'} = '';
$pakfiresettings{'AUTOUPDATE'} = 'off';
$pakfiresettings{'HEALTHCHECK'} = 'on';
$pakfiresettings{'UUID'} = 'on';
sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
@@ -163,9 +162,6 @@ my %checked=();
$checked{'AUTOUPDATE'}{'off'} = '';
$checked{'AUTOUPDATE'}{'on'} = '';
$checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";
$checked{'HEALTHCHECK'}{'off'} = '';
$checked{'HEALTHCHECK'}{'on'} = '';
$checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'";
$checked{'UUID'}{'off'} = '';
$checked{'UUID'}{'on'} = '';
$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'";
@@ -292,13 +288,6 @@ print <<END;
<tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
<input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
<tr><td align='left' width='45%'>$Lang::tr{'pakfire health check'}</td><td align="left">
on <input type='radio' name='HEALTHCHECK' value='on' $checked{'HEALTHCHECK'}{'on'} /> |
<input type='radio' name='HEALTHCHECK' value='off' $checked{'HEALTHCHECK'}{'off'} /> off </td></tr>
<tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left">
on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> |
<input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr>
<tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
</table>
</form>
END

8
html/cgi-bin/vpnmain.cgi
View File

@@ -2844,8 +2844,11 @@ END
}
print "<td align='center' $col>$confighash{$key}[25]</td>";
my $col1="bgcolor='${Header::colourred}'";
# get real state
my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
if ($confighash{$key}[33] eq "add") {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>";
}
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
@@ -2857,9 +2860,6 @@ END
} elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>";
} elsif ($confighash{$key}[33] eq "add") {
$col1="bgcolor='${Header::colourorange}'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>";
}
}
# move to blue if really down

7
html/html/redirect-templates/legacy/template.html
View File

@@ -3,11 +3,16 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>ACCESS MESSAGE</title>
<style content="text/css">
td.image {
background-image: url(data:image/gif;base64,IMAGEDATAPLACEHOLDER);
}
</style>
</head>
<body>
<table width="100%" height='100%' border="0">
<tr>
<td colspan='3' width='100%' height='130' align="center" background="<TMPL_VAR NAME="ADDRESS">/images/background.gif">
<td colspan='3' width='100%' height='152px' align="center" class="image">&nbsp;</td>
<tr>
<td width='10%'>
<td align='center' bgcolor='#CC000000' width='80%'>

2
lfs/7zip
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Archive-Tar
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Archive-Zip
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/BerkeleyDB
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Compress-Zlib
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Convert-TNEF
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Convert-UUlib
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Crypt-PasswdMD5
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Digest
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Digest-HMAC
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Digest-SHA1
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/GD-Graph
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/GD-TextUtil
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/GeoIP
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/HTML-Parser
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/HTML-Tagset
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/HTML-Template
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

4
lfs/IO-Socket-SSL
View File

@@ -1,6 +1,6 @@
###############################################################################
# IPFire.org - An Open Source Firewall Solution #
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
###############################################################################
###############################################################################
@@ -59,4 +59,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
@$(POSTBUILD)

2
lfs/IO-Stringy
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Locale-Country
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/MIME-Tools
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Mail-Tools
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Net-DNS
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Net-IPv4Addr
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Net-Server
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Net-Telnet
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Net_SSLeay
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Text-Tabs+Wrap
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/URI
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/Unix-Syslog
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/XML-Parser
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/acl
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/acpid
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/alsa
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/amavisd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/apache2
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/apcupsd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/apr
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/aprutil
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/arm
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/arping
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/asterisk
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/attr
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/autoconf
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/automake
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/avahi
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

2
lfs/aws-cli
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #

Some files were not shown because too many files have changed in this diff Show More