restore_backup() {
local filename="${1}"
+ # remove all openvpn certs to prevent old unusable
+ # certificates being left in directory after a restore
+ rm -f /var/ipfire/ovpn/certs/*
+
# Extract backup
if ! tar xvzpf "${filename}" -C / \
--exclude-from="/var/ipfire/backup/exclude" \
# Set correct ownership
chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
+ # Generate new HTTPS RSA key if the existing is too small
+ KEYSIZE=$(openssl rsa -in /etc/httpd/server.key -text -noout | sed -n 's/Private-Key:\ (\(.*\)\ bit.*/\1/p')
+ if [ $KEYSIZE \< 2048 ]; then
+ openssl genrsa -out /etc/httpd/server.key 4096 &>/dev/null
+ chmod 600 /etc/httpd/server.key
+ sed "s/HOSTNAME/`hostname -f`/" < /etc/certparams | \
+ openssl req -new -key /etc/httpd/server.key \
+ -out /etc/httpd/server.csr &>/dev/null
+ openssl x509 -req -days 999999 -sha256 \
+ -in /etc/httpd/server.csr \
+ -signkey /etc/httpd/server.key \
+ -out /etc/httpd/server.crt &>/dev/null
+ fi
return 0
}
--- /dev/null
+/etc/asound.state
+/var/ipfire/mpd/db/
+/var/ipfire/mpd/mpd.conf
+/var/ipfire/mpd/mpd_state
-/etc/asound.state
-/var/ipfire/mpfire/db/
-/var/ipfire/mpfire/mpd.conf
-/var/ipfire/mpfire/mpd_state
/var/ipfire/mpfire/settings
/var/ipfire/mpfire/webradio
--- /dev/null
+/var/lib/mympd
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-#
-# Certificate "Security Communication Root CA"
-#
-# Issuer: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP
-# Serial Number: 0 (0x0)
-# Subject: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP
-# Not Valid Before: Tue Sep 30 04:20:49 2003
-# Not Valid After : Sat Sep 30 04:20:49 2023
-# Fingerprint (SHA-256): E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C
-# Fingerprint (SHA1): 36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7
-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 "Security Communication Root CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061
-\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040
-\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125
-\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155
-\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103
-\101\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061
-\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040
-\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125
-\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155
-\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103
-\101\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\132\060\202\002\102\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061\030
-\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040\124
-\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125\004
-\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155\155
-\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103\101
-\061\060\036\027\015\060\063\060\071\063\060\060\064\062\060\064
-\071\132\027\015\062\063\060\071\063\060\060\064\062\060\064\071
-\132\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120
-\061\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115
-\040\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003
-\125\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157
-\155\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164
-\103\101\061\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\263\263\376\177\323\155\261\357\026\174\127\245
-\014\155\166\212\057\113\277\144\373\114\356\212\360\363\051\174
-\365\377\356\052\340\351\351\272\133\144\042\232\232\157\054\072
-\046\151\121\005\231\046\334\325\034\152\161\306\232\175\036\235
-\335\174\154\306\214\147\147\112\076\370\161\260\031\047\251\011
-\014\246\225\277\113\214\014\372\125\230\073\330\350\042\241\113
-\161\070\171\254\227\222\151\263\211\176\352\041\150\006\230\024
-\226\207\322\141\066\274\155\047\126\236\127\356\300\300\126\375
-\062\317\244\331\216\302\043\327\215\250\363\330\045\254\227\344
-\160\070\364\266\072\264\235\073\227\046\103\243\241\274\111\131
-\162\114\043\060\207\001\130\366\116\276\034\150\126\146\257\315
-\101\135\310\263\115\052\125\106\253\037\332\036\342\100\075\333
-\315\175\271\222\200\234\067\335\014\226\144\235\334\042\367\144
-\213\337\141\336\025\224\122\025\240\175\122\311\113\250\041\311
-\306\261\355\313\303\225\140\321\017\360\253\160\370\337\313\115
-\176\354\326\372\253\331\275\177\124\362\245\351\171\372\331\326
-\166\044\050\163\002\003\001\000\001\243\077\060\075\060\035\006
-\003\125\035\016\004\026\004\024\240\163\111\231\150\334\205\133
-\145\343\233\050\057\127\237\275\063\274\007\110\060\013\006\003
-\125\035\017\004\004\003\002\001\006\060\017\006\003\125\035\023
-\001\001\377\004\005\060\003\001\001\377\060\015\006\011\052\206
-\110\206\367\015\001\001\005\005\000\003\202\001\001\000\150\100
-\251\250\273\344\117\135\171\263\005\265\027\263\140\023\353\306
-\222\135\340\321\323\152\376\373\276\233\155\277\307\005\155\131
-\040\304\034\360\267\332\204\130\002\143\372\110\026\357\117\245
-\013\367\112\230\362\077\236\033\255\107\153\143\316\010\107\353
-\122\077\170\234\257\115\256\370\325\117\317\232\230\052\020\101
-\071\122\304\335\331\233\016\357\223\001\256\262\056\312\150\102
-\044\102\154\260\263\072\076\315\351\332\110\304\025\313\351\371
-\007\017\222\120\111\212\335\061\227\137\311\351\067\252\073\131
-\145\227\224\062\311\263\237\076\072\142\130\305\111\255\142\016
-\161\245\062\252\057\306\211\166\103\100\023\023\147\075\242\124
-\045\020\313\361\072\362\331\372\333\111\126\273\246\376\247\101
-\065\303\340\210\141\311\210\307\337\066\020\042\230\131\352\260
-\112\373\126\026\163\156\254\115\367\042\241\117\255\035\172\055
-\105\047\345\060\301\136\362\332\023\313\045\102\121\225\107\003
-\214\154\041\314\164\102\355\123\377\063\213\217\017\127\001\026
-\057\317\246\356\311\160\042\024\275\375\276\154\013\003
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for "Security Communication Root CA"
-# Issuer: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP
-# Serial Number: 0 (0x0)
-# Subject: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP
-# Not Valid Before: Tue Sep 30 04:20:49 2003
-# Not Valid After : Sat Sep 30 04:20:49 2023
-# Fingerprint (SHA-256): E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C
-# Fingerprint (SHA1): 36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7
-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 "Security Communication Root CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\066\261\053\111\371\201\236\327\114\236\274\070\017\306\126\217
-\135\254\262\367
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\361\274\143\152\124\340\265\047\365\315\347\032\343\115\156\112
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061
-\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040
-\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125
-\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155
-\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103
-\101\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-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 "XRamp Global CA Root"
#
\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_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
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 "D-Trust SBR Root CA 1 2022"
+#
+# Issuer: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE
+# Serial Number:52:cf:e4:8c:6d:a0:4a:f7:3f:82:97:0c:80:09:8c:95
+# Subject: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE
+# Not Valid Before: Wed Jul 06 11:30:00 2022
+# Not Valid After : Mon Jul 06 11:29:59 2037
+# Fingerprint (SHA-256): D9:2C:17:1F:5C:F8:90:BA:42:80:19:29:29:27:FE:22:F3:20:7F:D2:B5:44:49:CB:6F:67:5A:F4:92:21:46:E2
+# Fingerprint (SHA1): 0F:52:3A:6B:4E:7D:1D:18:05:A5:48:F9:4D:CD:E4:C3:1E:1B:E9:E6
+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 "D-Trust SBR Root CA 1 2022"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163
+\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023
+\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157
+\164\040\103\101\040\061\040\062\060\062\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163
+\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023
+\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157
+\164\040\103\101\040\061\040\062\060\062\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\122\317\344\214\155\240\112\367\077\202\227\014\200\011
+\214\225
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\136\060\202\001\343\240\003\002\001\002\002\020\122
+\317\344\214\155\240\112\367\077\202\227\014\200\011\214\225\060
+\012\006\010\052\206\110\316\075\004\003\003\060\111\061\013\060
+\011\006\003\125\004\006\023\002\104\105\061\025\060\023\006\003
+\125\004\012\023\014\104\055\124\162\165\163\164\040\107\155\142
+\110\061\043\060\041\006\003\125\004\003\023\032\104\055\124\162
+\165\163\164\040\123\102\122\040\122\157\157\164\040\103\101\040
+\061\040\062\060\062\062\060\036\027\015\062\062\060\067\060\066
+\061\061\063\060\060\060\132\027\015\063\067\060\067\060\066\061
+\061\062\071\065\071\132\060\111\061\013\060\011\006\003\125\004
+\006\023\002\104\105\061\025\060\023\006\003\125\004\012\023\014
+\104\055\124\162\165\163\164\040\107\155\142\110\061\043\060\041
+\006\003\125\004\003\023\032\104\055\124\162\165\163\164\040\123
+\102\122\040\122\157\157\164\040\103\101\040\061\040\062\060\062
+\062\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005
+\053\201\004\000\042\003\142\000\004\131\223\071\366\214\111\146
+\050\327\141\014\310\253\177\014\243\055\337\242\244\174\222\053
+\150\325\056\176\036\100\313\264\150\111\177\022\241\253\177\127
+\237\031\056\143\056\133\376\146\161\014\063\017\271\336\153\304
+\210\303\261\357\354\071\100\343\226\253\333\345\173\256\037\334
+\371\257\106\232\152\106\006\057\307\067\144\213\027\142\376\226
+\303\242\356\204\340\260\227\071\274\243\201\217\060\201\214\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\361\051\243\036\001
+\022\035\075\165\126\115\307\120\174\305\031\252\017\030\267\060
+\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060
+\112\006\003\125\035\037\004\103\060\101\060\077\240\075\240\073
+\206\071\150\164\164\160\072\057\057\143\162\154\056\144\055\164
+\162\165\163\164\056\156\145\164\057\143\162\154\057\144\055\164
+\162\165\163\164\137\163\142\162\137\162\157\157\164\137\143\141
+\137\061\137\062\060\062\062\056\143\162\154\060\012\006\010\052
+\206\110\316\075\004\003\003\003\151\000\060\146\002\061\000\227
+\371\336\256\113\217\230\265\036\100\177\062\175\115\124\103\332
+\211\315\302\252\222\074\321\202\036\163\317\372\114\222\040\373
+\143\047\305\365\163\075\011\075\367\247\141\206\214\363\152\002
+\061\000\347\057\174\270\365\045\214\073\071\037\066\253\215\365
+\206\242\056\341\172\144\332\147\071\002\376\376\063\077\331\163
+\266\130\133\072\374\262\244\331\140\170\167\314\171\247\246\256
+\125\275
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "D-Trust SBR Root CA 1 2022"
+# Issuer: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE
+# Serial Number:52:cf:e4:8c:6d:a0:4a:f7:3f:82:97:0c:80:09:8c:95
+# Subject: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE
+# Not Valid Before: Wed Jul 06 11:30:00 2022
+# Not Valid After : Mon Jul 06 11:29:59 2037
+# Fingerprint (SHA-256): D9:2C:17:1F:5C:F8:90:BA:42:80:19:29:29:27:FE:22:F3:20:7F:D2:B5:44:49:CB:6F:67:5A:F4:92:21:46:E2
+# Fingerprint (SHA1): 0F:52:3A:6B:4E:7D:1D:18:05:A5:48:F9:4D:CD:E4:C3:1E:1B:E9:E6
+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 "D-Trust SBR Root CA 1 2022"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\017\122\072\153\116\175\035\030\005\245\110\371\115\315\344\303
+\036\033\351\346
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\023\074\033\202\352\156\352\355\144\142\351\132\171\005\151\004
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163
+\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023
+\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157
+\164\040\103\101\040\061\040\062\060\062\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\122\317\344\214\155\240\112\367\077\202\227\014\200\011
+\214\225
+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 "D-Trust SBR Root CA 2 2022"
+#
+# Issuer: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE
+# Serial Number:54:d5:a3:95:1e:3d:95:ba:72:1b:9a:d0:31:21:4a:ba
+# Subject: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE
+# Not Valid Before: Thu Jul 07 07:30:00 2022
+# Not Valid After : Tue Jul 07 07:29:59 2037
+# Fingerprint (SHA-256): DB:A8:4D:D7:EF:62:2D:48:54:63:A9:01:37:EA:4D:57:4D:F8:55:09:28:F6:AF:A0:3B:4D:8B:11:41:E6:36:CC
+# Fingerprint (SHA1): 27:FF:63:B9:EF:34:29:31:03:38:1A:D8:60:60:DA:CC:60:28:35:E1
+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 "D-Trust SBR Root CA 2 2022"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163
+\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023
+\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157
+\164\040\103\101\040\062\040\062\060\062\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163
+\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023
+\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157
+\164\040\103\101\040\062\040\062\060\062\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\124\325\243\225\036\075\225\272\162\033\232\320\061\041
+\112\272
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\254\060\202\003\224\240\003\002\001\002\002\020\124
+\325\243\225\036\075\225\272\162\033\232\320\061\041\112\272\060
+\015\006\011\052\206\110\206\367\015\001\001\015\005\000\060\111
+\061\013\060\011\006\003\125\004\006\023\002\104\105\061\025\060
+\023\006\003\125\004\012\023\014\104\055\124\162\165\163\164\040
+\107\155\142\110\061\043\060\041\006\003\125\004\003\023\032\104
+\055\124\162\165\163\164\040\123\102\122\040\122\157\157\164\040
+\103\101\040\062\040\062\060\062\062\060\036\027\015\062\062\060
+\067\060\067\060\067\063\060\060\060\132\027\015\063\067\060\067
+\060\067\060\067\062\071\065\071\132\060\111\061\013\060\011\006
+\003\125\004\006\023\002\104\105\061\025\060\023\006\003\125\004
+\012\023\014\104\055\124\162\165\163\164\040\107\155\142\110\061
+\043\060\041\006\003\125\004\003\023\032\104\055\124\162\165\163
+\164\040\123\102\122\040\122\157\157\164\040\103\101\040\062\040
+\062\060\062\062\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\257\054\274\216\066\214\353\144\257\121\152
+\326\156\074\136\221\072\352\232\303\312\154\373\252\047\236\144
+\042\251\100\337\271\050\105\132\354\123\141\026\050\230\302\212
+\244\165\170\120\204\335\372\040\110\222\007\145\101\065\146\121
+\022\164\141\235\007\006\205\071\061\127\173\050\077\325\234\245
+\354\132\351\034\113\047\237\316\047\006\363\067\365\122\330\021
+\063\026\101\072\037\365\143\170\145\143\206\311\277\310\001\004
+\037\156\356\342\354\254\014\356\202\222\342\366\032\015\077\071
+\371\235\145\223\255\370\271\005\301\075\370\067\201\126\303\240
+\376\005\354\340\224\026\072\043\026\004\332\246\012\223\205\162
+\155\141\073\241\215\105\326\343\177\276\025\275\066\204\010\366
+\013\203\153\046\252\242\275\340\260\347\252\340\256\147\304\323
+\202\245\014\251\244\360\063\171\015\120\077\360\357\220\075\044
+\271\177\322\040\154\352\227\363\277\234\334\107\336\011\141\275
+\224\171\225\132\002\166\065\140\304\107\042\015\367\166\143\003
+\323\306\373\203\306\135\253\255\355\151\045\053\003\133\115\045
+\000\101\343\214\207\027\122\250\340\005\053\103\115\024\023\312
+\347\077\103\042\274\067\244\165\361\366\277\072\357\062\036\256
+\356\130\206\220\162\272\004\254\100\110\357\134\304\170\247\251
+\217\047\132\313\172\354\130\362\302\010\130\220\155\115\003\205
+\171\161\025\005\016\116\076\371\337\017\005\367\137\024\110\126
+\041\015\063\222\261\254\214\345\030\376\277\017\356\340\004\252
+\275\041\362\130\266\134\211\012\213\030\011\042\032\263\065\306
+\146\302\365\063\025\231\200\340\010\371\226\057\023\214\356\332
+\267\210\304\351\067\265\327\152\327\072\204\115\253\160\214\323
+\116\024\125\240\242\020\374\144\332\147\350\361\313\063\335\311
+\232\212\217\226\057\130\201\331\370\232\000\103\314\220\373\125
+\166\373\206\343\067\001\050\014\157\364\351\131\115\025\167\121
+\102\112\314\064\270\200\103\120\201\357\127\245\023\333\247\224
+\171\017\113\312\176\027\175\257\243\041\144\350\161\125\126\217
+\006\260\107\354\131\017\135\160\133\054\026\102\360\206\236\165
+\336\153\115\110\230\204\342\127\030\266\234\202\231\145\072\213
+\200\170\127\014\111\002\003\001\000\001\243\201\217\060\201\214
+\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\135\263\200\224
+\033\345\206\277\150\272\024\064\244\366\356\155\362\335\337\347
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
+\060\112\006\003\125\035\037\004\103\060\101\060\077\240\075\240
+\073\206\071\150\164\164\160\072\057\057\143\162\154\056\144\055
+\164\162\165\163\164\056\156\145\164\057\143\162\154\057\144\055
+\164\162\165\163\164\137\163\142\162\137\162\157\157\164\137\143
+\141\137\062\137\062\060\062\062\056\143\162\154\060\015\006\011
+\052\206\110\206\367\015\001\001\015\005\000\003\202\002\001\000
+\064\124\056\130\030\126\315\112\275\227\323\365\175\053\334\257
+\017\121\341\115\274\041\113\223\364\000\104\023\007\020\013\045
+\030\076\110\131\226\367\241\341\223\220\170\146\032\075\043\353
+\042\253\001\246\216\014\121\063\346\155\214\061\356\254\244\001
+\160\071\110\336\307\146\054\153\015\313\163\237\207\222\351\076
+\107\037\270\357\057\356\267\126\214\110\211\360\070\247\025\071
+\262\356\300\077\027\244\163\002\010\234\274\006\212\244\302\267
+\141\141\371\303\333\304\320\172\174\141\336\261\130\221\365\335
+\145\114\057\013\370\353\075\265\355\212\276\167\034\272\131\002
+\022\146\161\345\230\047\316\016\075\257\121\242\105\371\202\373
+\132\245\224\160\367\213\204\303\114\145\045\233\173\342\037\060
+\160\263\100\216\072\356\275\364\347\150\305\235\311\051\107\161
+\016\223\310\265\110\116\365\146\273\007\210\161\151\153\173\110
+\216\157\360\021\304\264\311\160\024\230\040\275\355\247\352\001
+\332\156\245\233\022\376\076\104\060\263\360\353\165\122\300\364
+\303\372\167\046\244\167\202\055\157\363\050\036\116\225\360\060
+\367\211\370\054\242\120\133\362\276\062\176\154\124\333\162\311
+\052\132\340\034\266\013\330\122\232\131\241\343\260\001\047\305
+\240\026\120\146\334\353\256\155\364\233\133\075\204\155\133\207
+\347\251\211\273\156\270\340\233\123\211\300\377\056\100\032\211
+\104\056\030\103\147\070\344\174\162\137\331\243\051\045\101\101
+\075\034\167\033\144\250\303\125\356\143\161\146\142\203\364\177
+\046\231\240\124\073\241\022\155\160\142\316\323\371\270\275\042
+\374\324\232\324\273\342\070\026\057\267\175\071\302\260\251\003
+\351\234\317\176\030\215\166\334\137\021\273\353\102\354\120\011
+\076\134\354\220\061\330\032\162\272\077\151\007\356\230\064\302
+\064\244\326\332\023\326\251\204\362\000\206\300\124\272\036\021
+\260\342\271\304\007\264\221\347\252\346\061\126\157\261\104\304
+\052\142\274\311\260\145\234\064\374\014\032\123\337\041\027\273
+\302\155\241\012\346\361\260\252\104\011\120\111\070\172\135\161
+\342\061\056\031\260\337\225\102\004\175\204\210\316\012\043\147
+\153\070\235\026\336\006\376\050\160\070\245\132\256\374\203\355
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "D-Trust SBR Root CA 2 2022"
+# Issuer: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE
+# Serial Number:54:d5:a3:95:1e:3d:95:ba:72:1b:9a:d0:31:21:4a:ba
+# Subject: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE
+# Not Valid Before: Thu Jul 07 07:30:00 2022
+# Not Valid After : Tue Jul 07 07:29:59 2037
+# Fingerprint (SHA-256): DB:A8:4D:D7:EF:62:2D:48:54:63:A9:01:37:EA:4D:57:4D:F8:55:09:28:F6:AF:A0:3B:4D:8B:11:41:E6:36:CC
+# Fingerprint (SHA1): 27:FF:63:B9:EF:34:29:31:03:38:1A:D8:60:60:DA:CC:60:28:35:E1
+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 "D-Trust SBR Root CA 2 2022"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\047\377\143\271\357\064\051\061\003\070\032\330\140\140\332\314
+\140\050\065\341
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\220\361\364\053\074\247\312\112\210\073\005\053\010\124\205\336
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163
+\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023
+\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157
+\164\040\103\101\040\062\040\062\060\062\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\124\325\243\225\036\075\225\272\162\033\232\320\061\041
+\112\272
+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 "Telekom Security SMIME ECC Root 2021"
+#
+# Issuer: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:15:2a:dd:14:c9:18:d1:a4:56:40:86:a6:25:af:07:5f
+# Subject: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Thu Mar 18 11:08:30 2021
+# Not Valid After : Sat Mar 17 23:59:59 2046
+# Fingerprint (SHA-256): 3A:E6:DF:7E:0D:63:7A:65:A8:C8:16:12:EC:6F:9A:14:2F:85:A1:68:34:C1:02:80:D8:8E:70:70:28:51:87:55
+# Fingerprint (SHA1): B7:F9:1D:98:EC:25:93:F3:50:14:84:9A:A8:7E:22:10:3C:C4:39:27
+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 "Telekom Security SMIME ECC Root 2021"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004
+\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\123\115\111\115\105\040\105\103\103\040\122\157
+\157\164\040\062\060\062\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004
+\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\123\115\111\115\105\040\105\103\103\040\122\157
+\157\164\040\062\060\062\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\025\052\335\024\311\030\321\244\126\100\206\246\045\257
+\007\137
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\107\060\202\001\315\240\003\002\001\002\002\020\025
+\052\335\024\311\030\321\244\126\100\206\246\045\257\007\137\060
+\012\006\010\052\206\110\316\075\004\003\003\060\145\061\013\060
+\011\006\003\125\004\006\023\002\104\105\061\047\060\045\006\003
+\125\004\012\014\036\104\145\165\164\163\143\150\145\040\124\145
+\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\107
+\155\142\110\061\055\060\053\006\003\125\004\003\014\044\124\145
+\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\123
+\115\111\115\105\040\105\103\103\040\122\157\157\164\040\062\060
+\062\061\060\036\027\015\062\061\060\063\061\070\061\061\060\070
+\063\060\132\027\015\064\066\060\063\061\067\062\063\065\071\065
+\071\132\060\145\061\013\060\011\006\003\125\004\006\023\002\104
+\105\061\047\060\045\006\003\125\004\012\014\036\104\145\165\164
+\163\143\150\145\040\124\145\154\145\153\157\155\040\123\145\143
+\165\162\151\164\171\040\107\155\142\110\061\055\060\053\006\003
+\125\004\003\014\044\124\145\154\145\153\157\155\040\123\145\143
+\165\162\151\164\171\040\123\115\111\115\105\040\105\103\103\040
+\122\157\157\164\040\062\060\062\061\060\166\060\020\006\007\052
+\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000
+\004\260\031\217\242\153\265\307\315\017\060\231\067\014\303\140
+\133\361\361\047\040\125\075\300\222\213\253\127\241\157\163\203
+\041\302\103\023\014\136\211\252\307\005\065\171\223\142\220\326
+\135\023\037\321\172\240\274\236\020\247\146\174\106\012\260\127
+\154\277\346\124\071\070\041\154\022\134\161\314\323\132\137\155
+\267\247\206\337\263\337\356\302\347\211\101\226\065\366\057\112
+\265\243\102\060\100\060\035\006\003\125\035\016\004\026\004\024
+\053\313\001\014\143\303\123\022\245\250\127\257\320\234\203\373
+\275\220\072\113\060\017\006\003\125\035\023\001\001\377\004\005
+\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004
+\004\003\002\001\006\060\012\006\010\052\206\110\316\075\004\003
+\003\003\150\000\060\145\002\061\000\326\274\110\222\207\107\003
+\307\160\073\045\266\037\256\106\147\163\164\000\047\113\344\245
+\004\242\003\337\136\050\255\156\136\003\310\335\150\234\266\277
+\224\020\110\225\057\017\377\030\213\002\060\001\100\063\236\227
+\227\115\005\362\164\124\014\315\071\375\152\153\011\301\044\077
+\141\216\070\241\267\350\327\104\025\021\142\377\016\141\067\107
+\113\100\177\112\137\262\147\132\163\165\302
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Telekom Security SMIME ECC Root 2021"
+# Issuer: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:15:2a:dd:14:c9:18:d1:a4:56:40:86:a6:25:af:07:5f
+# Subject: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Thu Mar 18 11:08:30 2021
+# Not Valid After : Sat Mar 17 23:59:59 2046
+# Fingerprint (SHA-256): 3A:E6:DF:7E:0D:63:7A:65:A8:C8:16:12:EC:6F:9A:14:2F:85:A1:68:34:C1:02:80:D8:8E:70:70:28:51:87:55
+# Fingerprint (SHA1): B7:F9:1D:98:EC:25:93:F3:50:14:84:9A:A8:7E:22:10:3C:C4:39:27
+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 "Telekom Security SMIME ECC Root 2021"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\267\371\035\230\354\045\223\363\120\024\204\232\250\176\042\020
+\074\304\071\047
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\165\275\136\355\174\015\146\076\007\244\233\274\002\007\330\264
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004
+\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\123\115\111\115\105\040\105\103\103\040\122\157
+\157\164\040\062\060\062\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\025\052\335\024\311\030\321\244\126\100\206\246\045\257
+\007\137
+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 "Telekom Security TLS ECC Root 2020"
+#
+# Issuer: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00
+# Subject: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Tue Aug 25 07:48:20 2020
+# Not Valid After : Fri Aug 25 23:59:59 2045
+# Fingerprint (SHA-256): 57:8A:F4:DE:D0:85:3F:4E:59:98:DB:4A:EA:F9:CB:EA:8D:94:5F:60:B6:20:A3:8D:1A:3C:13:B2:BC:7B:A8:E1
+# Fingerprint (SHA1): C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC
+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 "Telekom Security TLS ECC Root 2020"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164
+\040\062\060\062\060
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164
+\040\062\060\062\060
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\066\072\226\214\311\134\262\130\315\320\001\135\305\345
+\127\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\102\060\202\001\311\240\003\002\001\002\002\020\066
+\072\226\214\311\134\262\130\315\320\001\135\305\345\127\000\060
+\012\006\010\052\206\110\316\075\004\003\003\060\143\061\013\060
+\011\006\003\125\004\006\023\002\104\105\061\047\060\045\006\003
+\125\004\012\014\036\104\145\165\164\163\143\150\145\040\124\145
+\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\107
+\155\142\110\061\053\060\051\006\003\125\004\003\014\042\124\145
+\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\124
+\114\123\040\105\103\103\040\122\157\157\164\040\062\060\062\060
+\060\036\027\015\062\060\060\070\062\065\060\067\064\070\062\060
+\132\027\015\064\065\060\070\062\065\062\063\065\071\065\071\132
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164
+\040\062\060\062\060\060\166\060\020\006\007\052\206\110\316\075
+\002\001\006\005\053\201\004\000\042\003\142\000\004\316\277\376
+\127\250\277\325\252\367\020\232\315\274\321\021\242\275\147\102
+\314\220\353\025\030\220\331\242\315\014\052\045\353\076\117\316
+\265\322\217\017\363\065\332\103\213\002\200\276\157\121\044\035
+\017\153\053\312\237\302\157\120\062\345\067\040\266\040\377\210
+\015\017\155\111\273\333\006\244\207\220\222\224\364\011\320\317
+\177\310\200\013\301\227\263\273\065\047\311\302\033\243\102\060
+\100\060\035\006\003\125\035\016\004\026\004\024\343\162\314\156
+\225\231\107\261\346\263\141\114\321\313\253\343\272\315\336\237
+\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001
+\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
+\006\060\012\006\010\052\206\110\316\075\004\003\003\003\147\000
+\060\144\002\060\165\122\213\267\244\020\117\256\112\020\213\262
+\204\133\102\341\346\052\066\002\332\240\156\031\077\045\277\332
+\131\062\216\344\373\220\334\223\144\316\255\264\101\107\140\342
+\317\247\313\036\002\060\067\101\214\146\337\101\153\326\203\000
+\101\375\057\132\367\120\264\147\321\054\250\161\327\103\312\234
+\047\044\221\203\110\015\317\315\367\124\201\257\354\177\344\147
+\333\270\220\356\335\045
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Telekom Security TLS ECC Root 2020"
+# Issuer: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00
+# Subject: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Tue Aug 25 07:48:20 2020
+# Not Valid After : Fri Aug 25 23:59:59 2045
+# Fingerprint (SHA-256): 57:8A:F4:DE:D0:85:3F:4E:59:98:DB:4A:EA:F9:CB:EA:8D:94:5F:60:B6:20:A3:8D:1A:3C:13:B2:BC:7B:A8:E1
+# Fingerprint (SHA1): C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC
+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 "Telekom Security TLS ECC Root 2020"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\300\370\226\305\251\073\001\006\041\007\332\030\102\110\274\351
+\235\210\325\354
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\301\253\376\152\020\054\003\215\274\034\042\062\300\205\247\375
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164
+\040\062\060\062\060
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\066\072\226\214\311\134\262\130\315\320\001\135\305\345
+\127\000
+END
+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 "Telekom Security SMIME RSA Root 2023"
+#
+# Issuer: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:0c:7e:62:f5:79:73:3b:9d:43:8e:8b:63:ed:91:95:b8
+# Subject: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Tue Mar 28 12:09:22 2023
+# Not Valid After : Fri Mar 27 23:59:59 2048
+# Fingerprint (SHA-256): 78:A6:56:34:4F:94:7E:9C:C0:F7:34:D9:05:3D:32:F6:74:20:86:B6:B9:CD:2C:AE:4F:AE:1A:2E:4E:FD:E0:48
+# Fingerprint (SHA1): 89:3F:6F:1C:E2:4D:7F:FB:C3:D3:14:7A:05:80:A7:DE:E1:0A:5E:4D
+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 "Telekom Security SMIME RSA Root 2023"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004
+\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\123\115\111\115\105\040\122\123\101\040\122\157
+\157\164\040\062\060\062\063
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004
+\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\123\115\111\115\105\040\122\123\101\040\122\157
+\157\164\040\062\060\062\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\014\176\142\365\171\163\073\235\103\216\213\143\355\221
+\225\270
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\267\060\202\003\237\240\003\002\001\002\002\020\014
+\176\142\365\171\163\073\235\103\216\213\143\355\221\225\270\060
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\145
+\061\013\060\011\006\003\125\004\006\023\002\104\105\061\047\060
+\045\006\003\125\004\012\014\036\104\145\165\164\163\143\150\145
+\040\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164
+\171\040\107\155\142\110\061\055\060\053\006\003\125\004\003\014
+\044\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164
+\171\040\123\115\111\115\105\040\122\123\101\040\122\157\157\164
+\040\062\060\062\063\060\036\027\015\062\063\060\063\062\070\061
+\062\060\071\062\062\132\027\015\064\070\060\063\062\067\062\063
+\065\071\065\071\132\060\145\061\013\060\011\006\003\125\004\006
+\023\002\104\105\061\047\060\045\006\003\125\004\012\014\036\104
+\145\165\164\163\143\150\145\040\124\145\154\145\153\157\155\040
+\123\145\143\165\162\151\164\171\040\107\155\142\110\061\055\060
+\053\006\003\125\004\003\014\044\124\145\154\145\153\157\155\040
+\123\145\143\165\162\151\164\171\040\123\115\111\115\105\040\122
+\123\101\040\122\157\157\164\040\062\060\062\063\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\357\305\016
+\213\276\062\322\147\107\377\012\114\147\263\052\277\310\303\305
+\221\353\265\307\036\221\341\146\250\210\213\125\040\200\037\121
+\136\167\227\236\031\012\134\307\153\067\041\174\003\066\001\364
+\210\045\331\250\056\101\252\374\330\046\340\226\100\142\171\256
+\127\236\003\070\032\034\262\167\024\076\351\241\162\320\344\340
+\067\321\027\106\355\120\134\172\130\305\370\053\367\165\057\317
+\201\236\132\054\267\072\254\240\131\230\004\121\014\377\111\305
+\120\375\036\323\107\205\113\063\117\242\067\265\257\004\232\047
+\062\235\126\325\077\125\141\343\213\157\256\121\376\227\376\151
+\007\372\142\133\046\346\024\171\025\245\023\070\256\137\067\276
+\224\112\326\015\200\026\151\244\221\262\072\111\230\165\235\106
+\020\212\134\172\177\204\245\350\257\036\307\253\263\132\106\265
+\243\113\365\246\043\066\000\106\261\333\005\266\033\316\236\172
+\062\134\232\325\162\303\235\206\115\053\204\323\036\265\210\332
+\020\170\234\042\303\073\043\265\353\023\007\275\157\123\354\233
+\354\233\323\145\365\007\011\343\135\247\231\265\176\206\216\325
+\002\377\267\205\011\343\107\024\335\226\146\030\064\336\010\325
+\337\313\030\231\142\013\053\354\000\135\122\104\323\306\226\374
+\062\126\045\221\317\315\031\073\225\071\076\002\207\231\143\266
+\325\076\064\172\017\021\165\201\274\175\004\312\140\264\050\165
+\327\002\121\335\122\000\056\307\375\211\361\134\363\313\244\047
+\022\070\217\273\373\211\360\344\304\070\054\276\202\240\161\141
+\142\221\217\110\014\057\053\251\260\361\313\020\004\347\164\277
+\067\220\357\117\052\103\065\227\022\306\052\160\015\336\054\125
+\107\171\143\051\365\312\037\152\006\122\034\256\055\044\042\203
+\042\257\320\252\060\267\052\037\377\145\043\130\145\223\310\216
+\175\100\020\061\206\170\331\125\313\074\060\360\336\121\052\000
+\066\322\047\105\137\330\350\241\041\075\176\106\126\073\051\105
+\361\035\005\011\316\266\103\060\334\105\220\020\060\114\244\153
+\206\213\077\075\057\061\221\161\357\046\271\366\276\235\260\154
+\337\021\356\130\077\103\171\206\071\200\361\046\027\007\230\360
+\231\252\060\054\103\131\024\316\355\342\100\023\205\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\035\006\003\125\035\016\004\026\004
+\024\232\316\254\052\354\001\372\145\160\336\227\235\361\322\000
+\214\245\243\144\273\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\037\006\003\125\035\043\004\030\060
+\026\200\024\232\316\254\052\354\001\372\145\160\336\227\235\361
+\322\000\214\245\243\144\273\060\015\006\011\052\206\110\206\367
+\015\001\001\014\005\000\003\202\002\001\000\343\120\375\365\100
+\026\042\011\226\072\015\251\357\201\347\056\062\360\241\361\111
+\136\173\210\015\004\162\327\276\147\250\272\035\356\120\273\162
+\156\172\321\273\014\162\060\106\310\325\327\002\022\026\231\116
+\036\337\132\226\356\217\221\276\256\206\370\020\167\245\304\156
+\107\141\300\362\046\331\117\141\150\005\110\165\010\025\245\241
+\173\325\270\263\211\171\346\355\361\363\141\000\206\173\056\061
+\376\243\134\370\171\075\264\133\210\173\340\043\273\015\241\027
+\372\313\150\015\230\167\161\010\342\155\103\164\153\304\066\305
+\224\101\244\000\326\127\055\231\212\213\040\022\025\002\062\016
+\322\111\354\201\110\305\152\047\122\327\262\163\125\123\226\074
+\236\117\114\265\240\320\117\127\320\147\050\110\144\276\306\270
+\272\354\144\317\310\173\305\152\347\052\346\131\127\266\326\324
+\326\300\147\134\331\236\050\011\100\277\363\251\065\061\145\140
+\003\313\031\154\202\225\003\036\137\077\341\275\352\111\161\345
+\133\267\013\107\026\033\040\211\155\224\231\014\176\210\154\035
+\015\364\267\041\032\131\227\254\313\350\276\027\037\225\174\123
+\233\257\120\122\252\215\013\056\257\132\327\140\362\052\151\052
+\271\356\124\160\030\252\275\365\241\077\322\335\241\143\031\000
+\370\247\014\353\243\171\362\160\131\243\370\242\022\003\354\023
+\377\344\002\206\066\327\301\303\244\265\324\244\302\067\105\266
+\224\160\075\305\275\353\243\025\035\343\066\172\025\151\052\126
+\064\071\317\245\232\066\252\310\355\171\274\317\366\316\004\123
+\013\332\262\120\043\174\274\076\046\255\360\016\103\273\046\313
+\256\302\100\336\067\037\012\240\121\315\143\235\266\117\330\306
+\107\174\274\330\264\355\236\213\363\021\342\250\265\076\354\256
+\160\076\176\042\273\065\110\027\140\142\024\221\060\243\166\075
+\246\121\066\213\037\015\335\152\061\034\245\355\335\226\243\156
+\162\017\023\115\252\247\251\134\170\371\003\022\030\223\067\105
+\022\211\075\370\276\312\275\331\276\014\331\030\144\247\310\101
+\076\165\202\041\070\175\145\364\240\324\023\113\007\170\051\371
+\235\176\314\207\077\304\332\056\210\335\343\013\334\132\121\132
+\351\331\022\117\236\002\333\367\005\045\121
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Telekom Security SMIME RSA Root 2023"
+# Issuer: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:0c:7e:62:f5:79:73:3b:9d:43:8e:8b:63:ed:91:95:b8
+# Subject: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Tue Mar 28 12:09:22 2023
+# Not Valid After : Fri Mar 27 23:59:59 2048
+# Fingerprint (SHA-256): 78:A6:56:34:4F:94:7E:9C:C0:F7:34:D9:05:3D:32:F6:74:20:86:B6:B9:CD:2C:AE:4F:AE:1A:2E:4E:FD:E0:48
+# Fingerprint (SHA1): 89:3F:6F:1C:E2:4D:7F:FB:C3:D3:14:7A:05:80:A7:DE:E1:0A:5E:4D
+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 "Telekom Security SMIME RSA Root 2023"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\211\077\157\034\342\115\177\373\303\323\024\172\005\200\247\336
+\341\012\136\115
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\353\335\044\371\050\017\243\302\303\156\012\077\320\303\015\033
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004
+\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\123\115\111\115\105\040\122\123\101\040\122\157
+\157\164\040\062\060\062\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\014\176\142\365\171\163\073\235\103\216\213\143\355\221
+\225\270
+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 "Telekom Security TLS RSA Root 2023"
+#
+# Issuer: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97
+# Subject: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Tue Mar 28 12:16:45 2023
+# Not Valid After : Fri Mar 27 23:59:59 2048
+# Fingerprint (SHA-256): EF:C6:5C:AD:BB:59:AD:B6:EF:E8:4D:A2:23:11:B3:56:24:B7:1B:3B:1E:A0:DA:8B:66:55:17:4E:C8:97:86:46
+# Fingerprint (SHA1): 54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93
+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 "Telekom Security TLS RSA Root 2023"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\122\123\101\040\122\157\157\164
+\040\062\060\062\063
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\122\123\101\040\122\157\157\164
+\040\062\060\062\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\041\234\124\055\350\366\354\161\167\372\116\350\303\160
+\127\227
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\263\060\202\003\233\240\003\002\001\002\002\020\041
+\234\124\055\350\366\354\161\167\372\116\350\303\160\127\227\060
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\143
+\061\013\060\011\006\003\125\004\006\023\002\104\105\061\047\060
+\045\006\003\125\004\012\014\036\104\145\165\164\163\143\150\145
+\040\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164
+\171\040\107\155\142\110\061\053\060\051\006\003\125\004\003\014
+\042\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164
+\171\040\124\114\123\040\122\123\101\040\122\157\157\164\040\062
+\060\062\063\060\036\027\015\062\063\060\063\062\070\061\062\061
+\066\064\065\132\027\015\064\070\060\063\062\067\062\063\065\071
+\065\071\132\060\143\061\013\060\011\006\003\125\004\006\023\002
+\104\105\061\047\060\045\006\003\125\004\012\014\036\104\145\165
+\164\163\143\150\145\040\124\145\154\145\153\157\155\040\123\145
+\143\165\162\151\164\171\040\107\155\142\110\061\053\060\051\006
+\003\125\004\003\014\042\124\145\154\145\153\157\155\040\123\145
+\143\165\162\151\164\171\040\124\114\123\040\122\123\101\040\122
+\157\157\164\040\062\060\062\063\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\355\065\241\201\200\363\313
+\112\151\133\302\373\121\203\256\046\375\341\156\363\201\022\175
+\161\100\377\207\165\102\051\041\355\201\122\054\337\022\301\031
+\204\211\301\275\305\050\325\325\113\154\104\326\114\333\007\226
+\112\125\172\312\066\202\004\066\250\245\374\047\366\111\361\325
+\162\236\221\371\043\326\160\173\273\365\233\301\354\223\317\031
+\352\145\176\210\160\240\163\374\366\377\265\126\142\341\163\152
+\064\230\076\202\270\254\225\123\364\001\240\047\007\162\243\000
+\123\240\344\262\253\203\070\127\063\045\224\237\276\110\035\230
+\341\243\272\236\134\315\004\161\121\175\165\170\253\363\131\252
+\304\340\140\276\217\203\122\270\165\032\101\065\355\274\363\072
+\143\351\251\024\105\327\346\122\321\156\322\336\274\343\365\013
+\073\346\340\304\275\103\144\023\246\316\364\230\067\154\212\225
+\250\227\310\107\017\360\136\020\213\347\035\034\376\261\073\240
+\005\063\150\005\101\202\301\003\053\001\310\347\217\115\253\350
+\265\366\315\153\104\265\347\335\213\354\352\045\264\000\042\127
+\115\260\261\262\061\301\026\316\377\375\024\204\267\107\372\262
+\361\160\336\333\213\154\066\130\244\174\263\021\321\303\167\177
+\137\266\045\340\015\305\322\263\371\270\270\167\333\067\161\161
+\107\343\140\030\117\044\266\165\067\170\271\243\142\257\275\311
+\162\216\057\314\273\256\333\344\025\122\031\007\063\373\152\267
+\055\113\220\050\202\163\376\030\213\065\215\333\247\004\152\276
+\352\301\115\066\073\026\066\221\062\357\266\100\211\221\103\340
+\362\242\253\004\056\346\362\114\016\026\064\040\254\207\301\055
+\176\311\146\107\027\024\021\244\363\367\241\044\211\253\330\032
+\310\241\134\261\243\367\214\155\310\001\311\117\311\354\304\374
+\254\121\063\321\310\203\321\311\237\035\324\107\064\051\076\313
+\260\016\372\203\013\050\130\345\051\334\077\174\250\237\311\266
+\012\273\246\350\106\026\017\226\345\173\344\152\172\110\155\166
+\230\005\245\334\155\036\102\036\102\332\032\340\122\367\265\203
+\300\032\173\170\065\054\070\365\037\375\111\243\056\322\131\143
+\277\200\260\214\223\163\313\065\246\231\225\042\141\145\003\140
+\373\057\223\113\372\232\234\200\073\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\035\006\003\125\035\016\004\026\004\024\266\247\227
+\202\075\164\205\233\367\074\237\223\232\225\171\165\122\214\155
+\107\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024\266
+\247\227\202\075\164\205\233\367\074\237\223\232\225\171\165\122
+\214\155\107\060\015\006\011\052\206\110\206\367\015\001\001\014
+\005\000\003\202\002\001\000\250\314\141\246\276\165\236\025\120
+\244\153\373\250\160\105\174\272\176\261\132\374\133\043\372\012
+\167\370\230\161\202\014\155\340\136\106\252\223\364\036\240\303
+\341\223\333\113\255\262\246\135\253\260\324\142\313\136\273\146
+\365\055\356\227\100\074\142\353\136\326\024\326\214\342\226\213
+\101\151\223\065\346\271\231\153\142\264\241\027\146\064\246\153
+\143\306\271\116\362\042\351\130\015\126\101\321\372\014\112\360
+\063\315\073\273\155\041\072\256\216\162\265\303\112\373\351\175
+\345\261\233\206\356\342\340\175\264\367\062\375\042\204\361\205
+\311\067\171\351\265\077\277\134\344\164\262\217\021\142\000\335
+\030\146\241\331\173\043\137\361\216\325\147\350\124\332\133\072
+\153\066\157\371\201\261\063\107\063\167\100\371\122\252\335\324
+\203\317\205\170\231\232\223\271\163\147\102\106\021\041\352\376
+\012\251\033\032\145\151\263\217\256\026\266\366\113\126\262\055
+\371\245\310\354\073\142\243\355\153\320\116\325\100\011\244\037
+\230\327\072\245\222\131\040\344\260\175\315\133\163\150\275\155
+\304\242\023\016\147\031\270\215\102\176\154\014\232\156\240\044
+\055\325\105\033\334\304\002\024\376\205\133\145\227\312\116\220
+\120\010\172\102\065\371\352\302\146\324\370\001\256\036\264\276
+\303\250\357\376\166\232\242\246\037\106\366\204\355\374\333\316
+\304\002\316\167\110\054\214\262\354\303\000\243\354\054\125\030
+\301\176\031\356\341\057\362\255\203\233\236\253\031\337\306\212
+\057\214\167\345\267\005\354\073\301\354\276\206\263\206\274\300
+\367\334\347\352\133\256\262\314\265\065\206\113\320\342\077\266
+\330\370\016\000\356\135\343\367\215\130\377\317\213\067\351\143
+\137\156\367\011\161\066\302\022\135\127\362\310\264\315\363\356
+\002\337\021\334\152\271\127\204\035\131\115\214\316\310\016\043
+\302\267\046\232\020\024\161\376\223\262\212\270\200\360\016\020
+\236\323\250\120\014\067\202\057\352\340\212\235\341\054\071\377
+\265\264\163\000\344\367\110\246\163\254\277\262\336\167\004\207
+\264\243\315\233\065\044\067\372\220\223\023\201\102\306\230\046
+\165\067\146\101\020\254\273\365\224\343\302\061\053\255\347\043
+\126\314\065\045\222\263\120
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Telekom Security TLS RSA Root 2023"
+# Issuer: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Serial Number:21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97
+# Subject: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE
+# Not Valid Before: Tue Mar 28 12:16:45 2023
+# Not Valid After : Fri Mar 27 23:59:59 2048
+# Fingerprint (SHA-256): EF:C6:5C:AD:BB:59:AD:B6:EF:E8:4D:A2:23:11:B3:56:24:B7:1B:3B:1E:A0:DA:8B:66:55:17:4E:C8:97:86:46
+# Fingerprint (SHA1): 54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93
+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 "Telekom Security TLS RSA Root 2023"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\124\323\254\263\275\127\126\366\205\235\316\345\303\041\342\324
+\255\203\320\223
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\277\133\353\124\100\315\110\161\304\040\215\175\336\012\102\362
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061
+\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143
+\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004
+\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162
+\151\164\171\040\124\114\123\040\122\123\101\040\122\157\157\164
+\040\062\060\062\063
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\041\234\124\055\350\366\354\161\167\372\116\350\303\160
+\127\227
+END
+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
# 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. #
+# GNU General Public License for more details. #update.sh
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
sub updatefwhitsgraph {
my $period = $_[0];
- RRDs::graph(
- @GRAPH_ARGS,
- "-",
- "--start",
- "-1".$period,
- "-r",
- "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
- "-v ".$Lang::tr{'bytes per second'},
- "--color=SHADEA".$color{"color19"},
- "--color=SHADEB".$color{"color19"},
- "--color=BACK".$color{"color21"},
- "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYOUT/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
- "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYIN/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
- "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
- "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
- "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
- "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
- "DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
- "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
- "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
- "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
- "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
- "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
- "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
- "GPRINT:output:MAX:%8.1lf %sBps",
- "GPRINT:output:AVERAGE:%8.1lf %sBps",
- "GPRINT:output:MIN:%8.1lf %sBps",
- "GPRINT:output:LAST:%8.1lf %sBps\\j",
- "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
- "GPRINT:forward:MAX:%8.1lf %sBps",
- "GPRINT:forward:AVERAGE:%8.1lf %sBps",
- "GPRINT:forward:MIN:%8.1lf %sBps",
- "GPRINT:forward:LAST:%8.1lf %sBps\\j",
- "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
- "GPRINT:input:MAX:%8.1lf %sBps",
- "GPRINT:input:AVERAGE:%8.1lf %sBps",
- "GPRINT:input:MIN:%8.1lf %sBps",
- "GPRINT:input:LAST:%8.1lf %sBps\\j",
- "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
- "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
- "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
- "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
- "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
- "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
- "GPRINT:portscan:MAX:%8.1lf %sBps",
- "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
- "GPRINT:portscan:MIN:%8.1lf %sBps",
- "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
- "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'spoofed or martians'}),
- "GPRINT:spoofedmartian:MAX:%8.1lf %sBps",
- "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
- "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
- "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
- "STACK:hostile".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks'}),
- "GPRINT:hostile:MAX:%8.1lf %sBps",
- "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
- "GPRINT:hostile:MIN:%8.1lf %sBps",
- "GPRINT:hostile:LAST:%8.1lf %sBps\\j",
- );
+ if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd" ) {
+ RRDs::graph(
+ @GRAPH_ARGS,
+ "-",
+ "--start",
+ "-1".$period,
+ "-r",
+ "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYOUT/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
+ "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYIN/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
+ "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
+ "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
+ "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
+ "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
+ "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+ "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+ "DEF:hostilelegacy=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+
+ # This creates a new combined hostile segment.
+ # Previously we did not split into incoming/outgoing, but we cannot go back in time. This CDEF will take the values
+ # from the old RRD database if it exists and if those values are UNKNOWN (time period after Hostile was split into In and Out),
+ # we replace them with the sum of IN + OUT.
+ "CDEF:hostile=hostilelegacy,UN,hostilein,hostileout,+,hostilelegacy,IF",
+
+ "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
+ "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
+ "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
+ "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
+ "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
+ "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
+ "GPRINT:output:MAX:%8.1lf %sBps",
+ "GPRINT:output:AVERAGE:%8.1lf %sBps",
+ "GPRINT:output:MIN:%8.1lf %sBps",
+ "GPRINT:output:LAST:%8.1lf %sBps\\j",
+ "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
+ "GPRINT:forward:MAX:%8.1lf %sBps",
+ "GPRINT:forward:AVERAGE:%8.1lf %sBps",
+ "GPRINT:forward:MIN:%8.1lf %sBps",
+ "GPRINT:forward:LAST:%8.1lf %sBps\\j",
+ "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
+ "GPRINT:input:MAX:%8.1lf %sBps",
+ "GPRINT:input:AVERAGE:%8.1lf %sBps",
+ "GPRINT:input:MIN:%8.1lf %sBps",
+ "GPRINT:input:LAST:%8.1lf %sBps\\j",
+ "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
+ "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
+ "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+ "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
+ "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
+ "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
+ "GPRINT:portscan:MAX:%8.1lf %sBps",
+ "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+ "GPRINT:portscan:MIN:%8.1lf %sBps",
+ "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
+ "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'spoofed or martians'}),
+ "GPRINT:spoofedmartian:MAX:%8.1lf %sBps",
+ "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
+ "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
+ "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
+ "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}),
+ "GPRINT:hostilein:MAX:%8.1lf %sBps",
+ "GPRINT:hostilein:AVERAGE:%8.1lf %sBps",
+ "GPRINT:hostilein:MIN:%8.1lf %sBps",
+ "GPRINT:hostilein:LAST:%8.1lf %sBps\\j",
+ "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}),
+ "GPRINT:hostileout:MAX:%8.1lf %sBps",
+ "GPRINT:hostileout:AVERAGE:%8.1lf %sBps",
+ "GPRINT:hostileout:MIN:%8.1lf %sBps",
+ "GPRINT:hostileout:LAST:%8.1lf %sBps\\j",
+ "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}),
+ "GPRINT:hostile:MAX:%8.1lf %sBps",
+ "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
+ "GPRINT:hostile:MIN:%8.1lf %sBps",
+ "GPRINT:hostile:LAST:%8.1lf %sBps\\j",
+ );
+ }else{
+ RRDs::graph(
+ @GRAPH_ARGS,
+ "-",
+ "--start",
+ "-1".$period,
+ "-r",
+ "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
+ "-v ".$Lang::tr{'bytes per second'},
+ "--color=SHADEA".$color{"color19"},
+ "--color=SHADEB".$color{"color19"},
+ "--color=BACK".$color{"color21"},
+ "DEF:output=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYOUT/ipt_bytes-DROP_OUTPUT.rrd:value:AVERAGE",
+ "DEF:input=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYIN/ipt_bytes-DROP_INPUT.rrd:value:AVERAGE",
+ "DEF:forward=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE",
+ "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE",
+ "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE",
+ "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE",
+ "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+ "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE",
+
+ # This creates a new combined hostile segment.
+ # If we started collecting IN/OUT, ie the old single Hostile RRD database is not available then this CDEF will take the values
+ # from the sum of IN + OUT.
+ "CDEF:hostile=hostilein,hostileout,+",
+
+ "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}),
+ "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
+ "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
+ "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}),
+ "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j",
+ "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"),
+ "GPRINT:output:MAX:%8.1lf %sBps",
+ "GPRINT:output:AVERAGE:%8.1lf %sBps",
+ "GPRINT:output:MIN:%8.1lf %sBps",
+ "GPRINT:output:LAST:%8.1lf %sBps\\j",
+ "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"),
+ "GPRINT:forward:MAX:%8.1lf %sBps",
+ "GPRINT:forward:AVERAGE:%8.1lf %sBps",
+ "GPRINT:forward:MIN:%8.1lf %sBps",
+ "GPRINT:forward:LAST:%8.1lf %sBps\\j",
+ "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"),
+ "GPRINT:input:MAX:%8.1lf %sBps",
+ "GPRINT:input:AVERAGE:%8.1lf %sBps",
+ "GPRINT:input:MIN:%8.1lf %sBps",
+ "GPRINT:input:LAST:%8.1lf %sBps\\j",
+ "STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
+ "GPRINT:newnotsyn:MAX:%8.1lf %sBps",
+ "GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+ "GPRINT:newnotsyn:MIN:%8.1lf %sBps",
+ "GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
+ "STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
+ "GPRINT:portscan:MAX:%8.1lf %sBps",
+ "GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+ "GPRINT:portscan:MIN:%8.1lf %sBps",
+ "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
+ "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'spoofed or martians'}),
+ "GPRINT:spoofedmartian:MAX:%8.1lf %sBps",
+ "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps",
+ "GPRINT:spoofedmartian:MIN:%8.1lf %sBps",
+ "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j",
+ "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}),
+ "GPRINT:hostilein:MAX:%8.1lf %sBps",
+ "GPRINT:hostilein:AVERAGE:%8.1lf %sBps",
+ "GPRINT:hostilein:MIN:%8.1lf %sBps",
+ "GPRINT:hostilein:LAST:%8.1lf %sBps\\j",
+ "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}),
+ "GPRINT:hostileout:MAX:%8.1lf %sBps",
+ "GPRINT:hostileout:AVERAGE:%8.1lf %sBps",
+ "GPRINT:hostileout:MIN:%8.1lf %sBps",
+ "GPRINT:hostileout:LAST:%8.1lf %sBps\\j",
+ "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}),
+ "GPRINT:hostile:MAX:%8.1lf %sBps",
+ "GPRINT:hostile:AVERAGE:%8.1lf %sBps",
+ "GPRINT:hostile:MIN:%8.1lf %sBps",
+ "GPRINT:hostile:LAST:%8.1lf %sBps\\j",
+ );
+ }
$ERROR = RRDs::error;
return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
}
$Header::swroot = '/var/ipfire';
$Header::graphdir='/srv/web/ipfire/html/graphs';
$Header::pagecolour = '#ffffff';
-#$Header::tablecolour = '#a0a0a0';
-$Header::tablecolour = '#FFFFFF';
-$Header::bigboxcolour = '#F6F4F4';
-$Header::boxcolour = '#EAE9EE';
-$Header::bordercolour = '#000000';
-$Header::table1colour = '#E0E0E0';
-$Header::table2colour = '#F0F0F0';
+$Header::bordercolour = '#363636';
+$Header::table1colour = '#f5f5f5';
+$Header::table2colour = '#fafafa';
$Header::colourred = '#993333';
$Header::colourorange = '#FF9933';
$Header::colouryellow = '#FFFF00';
Chain filter POLICYOUT DROP_OUTPUT
Chain filter POLICYIN DROP_INPUT
Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN
- Chain filter HOSTILE_DROP DROP_HOSTILE
+ Chain filter HOSTILE_DROP_IN DROP_HOSTILE
+ Chain filter HOSTILE_DROP_OUT DROP_HOSTILE
</Plugin>
#<Plugin logfile>
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
&ipset_restore($HOSTILE_CCODE);
# Check traffic in incoming/outgoing direction and drop if it matches
- run("$IPTABLES -A HOSTILE -i $RED_DEV -m set --match-set $HOSTILE_CCODE src -j HOSTILE_DROP");
- run("$IPTABLES -A HOSTILE -o $RED_DEV -m set --match-set $HOSTILE_CCODE dst -j HOSTILE_DROP");
+ run("$IPTABLES -A HOSTILE -i $RED_DEV -m set --match-set $HOSTILE_CCODE src -j HOSTILE_DROP_IN");
+ run("$IPTABLES -A HOSTILE -o $RED_DEV -m set --match-set $HOSTILE_CCODE dst -j HOSTILE_DROP_OUT");
}
sub ipblocklist () {
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.11-ipfire Kernel Configuration
+# Linux/arm64 6.6.15-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2645198=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
CONFIG_ARM64_ERRATUM_2966298=y
+CONFIG_ARM64_ERRATUM_3117295=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23154=y
CONFIG_CAVIUM_ERRATUM_27456=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_TIOCSTI=y
+# CONFIG_LEGACY_TIOCSTI is not set
# CONFIG_LDISC_AUTOLOAD is not set
#
CONFIG_MMC_BCM2835=y
# CONFIG_MMC_MTK is not set
# CONFIG_MMC_SDHCI_XENON is not set
-# CONFIG_MMC_SDHCI_OMAP is not set
-# CONFIG_MMC_SDHCI_AM654 is not set
# CONFIG_SCSI_UFSHCD is not set
# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
#
# Automatically generated file; DO NOT EDIT.
-# Linux/riscv 6.6.11-ipfire Kernel Configuration
+# Linux/riscv 6.6.15-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_TIOCSTI=y
+# CONFIG_LEGACY_TIOCSTI is not set
# CONFIG_LDISC_AUTOLOAD is not set
#
# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_MTK is not set
CONFIG_MMC_SDHCI_XENON=m
-# CONFIG_MMC_SDHCI_OMAP is not set
-# CONFIG_MMC_SDHCI_AM654 is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFS_BSG=y
CONFIG_SCSI_UFS_CRYPTO=y
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.11-ipfire Kernel Configuration
+# Linux/x86 6.6.15-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
-CONFIG_LEGACY_TIOCSTI=y
+# CONFIG_LEGACY_TIOCSTI is not set
# CONFIG_LDISC_AUTOLOAD is not set
#
--- /dev/null
+ $subipfire->{'41.mympd'} = {'caption' => myMPD,
+ 'uri' => '/cgi-bin/mympd.cgi',
+ 'title' => myMPD,
+ 'enabled' => 1,
+ };
--- /dev/null
+ $subipfire->{'42.transmission'} = {'caption' => TransmissionBT,
+ 'uri' => '/cgi-bin/transmission.cgi',
+ 'title' => TransmissionBT,
+ 'enabled' => 1,
+ };
--- /dev/null
+ $subipfire->{'60.vdr'} = {'caption' => VDR,
+ 'uri' => '/cgi-bin/vdr.cgi',
+ 'title' => VDR,
+ 'enabled' => 1,
+ };
##################### REQUIRED ###########################
port "6600"
music_directory "/var/mp3"
-playlist_directory "/var/ipfire/mpfire"
+playlist_directory "/var/ipfire/mpd"
log_file "/var/log/mpd.log"
pid_file "/var/run/mpd.pid"
##########################################################
#
# Location of DB file
#
-db_file "/var/ipfire/mpfire/db/mpd.db"
+db_file "/var/ipfire/mpd/db/mpd.db"
#
# The state file (if set) will be a file
# for storing all current information
# to recreate your last MPD session after
# restart.
#
-state_file "/var/ipfire/mpfire/mpd_state"
+state_file "/var/ipfire/mpd/mpd_state"
#
##########################################################
#
audio_buffer_size "2048"
#
-# This means exactly what it says, it will
-# buffer your file up to the percentage of
-# the buffer before it begins playing.
-#
-buffer_before_play "25%"
-#
##########################################################
#
filesystem_charset "UTF-8"
#
-# The encoding that ID3v1 tags should be converted from.
-#
-id3v1_encoding "UTF-8"
metadata_to_use "artist,album,title,track,name,comment,date,genre"
#
################################################################
}
sub checkplaylist(){
- my $Datei = "/var/ipfire/mpfire/playlist.m3u";
+ my $Datei = "/var/ipfire/mpd/playlist.m3u";
my @Info = stat($Datei);
if ( $Info[7] eq '' || $Info[7] eq '0' ){print "There is no playlist";exit(1);}
}
#usr/lib/ldscripts/armelfb_linux_eabi.xu
#usr/lib/ldscripts/armelfb_linux_eabi.xw
#usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.41.so
+#usr/lib/ldscripts/stamp
+usr/lib/libbfd-2.42.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
#usr/lib/libgprofng.so
usr/lib/libgprofng.so.0
usr/lib/libgprofng.so.0.0.0
-usr/lib/libopcodes-2.41.so
+usr/lib/libopcodes-2.42.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
#usr/share/locale/ja/LC_MESSAGES/ld.mo
#usr/share/locale/ka/LC_MESSAGES/bfd.mo
#usr/share/locale/ka/LC_MESSAGES/gprof.mo
+#usr/share/locale/ka/LC_MESSAGES/ld.mo
#usr/share/locale/ms
#usr/share/locale/ms/LC_MESSAGES
#usr/share/locale/ms/LC_MESSAGES/gprof.mo
#usr/share/locale/ro/LC_MESSAGES/bfd.mo
#usr/share/locale/ro/LC_MESSAGES/binutils.mo
#usr/share/locale/ro/LC_MESSAGES/gprof.mo
+#usr/share/locale/ro/LC_MESSAGES/ld.mo
#usr/share/locale/ro/LC_MESSAGES/opcodes.mo
#usr/share/locale/ru/LC_MESSAGES/bfd.mo
#usr/share/locale/ru/LC_MESSAGES/binutils.mo
#usr/include/bits/netdb.h
#usr/include/bits/param.h
#usr/include/bits/poll.h
+#usr/include/bits/platform/features.h
#usr/include/bits/poll2.h
#usr/include/bits/posix1_lim.h
#usr/include/bits/posix2_lim.h
#usr/include/bits/socket.h
#usr/include/bits/socket2.h
#usr/include/bits/socket_type.h
+#usr/include/bits/spawn_ext.h
#usr/include/bits/ss_flags.h
#usr/include/bits/stab.def
#usr/include/bits/stat.h
#usr/include/bits/statx-generic.h
#usr/include/bits/statx.h
#usr/include/bits/stdint-intn.h
+#usr/include/bits/stdint-least.h
#usr/include/bits/stdint-uintn.h
#usr/include/bits/stdio-ldbl.h
#usr/include/bits/stdio.h
#usr/include/signal.h
#usr/include/spawn.h
#usr/include/stab.h
+#usr/include/stdbit.h
#usr/include/stdc-predef.h
#usr/include/stdint.h
#usr/include/stdio.h
#usr/lib/libc_nonshared.a
#usr/lib/libdl.a
#usr/lib/libg.a
-#usr/lib/libm-2.38.a
+#usr/lib/libm-2.39.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
#usr/lib/locale/aa_ER/LC_PAPER
#usr/lib/locale/aa_ER/LC_TELEPHONE
#usr/lib/locale/aa_ER/LC_TIME
-#usr/lib/locale/aa_ER@saaho
-#usr/lib/locale/aa_ER@saaho/LC_ADDRESS
-#usr/lib/locale/aa_ER@saaho/LC_COLLATE
-#usr/lib/locale/aa_ER@saaho/LC_CTYPE
-#usr/lib/locale/aa_ER@saaho/LC_IDENTIFICATION
-#usr/lib/locale/aa_ER@saaho/LC_MEASUREMENT
-#usr/lib/locale/aa_ER@saaho/LC_MESSAGES
-#usr/lib/locale/aa_ER@saaho/LC_MESSAGES/SYS_LC_MESSAGES
-#usr/lib/locale/aa_ER@saaho/LC_MONETARY
-#usr/lib/locale/aa_ER@saaho/LC_NAME
-#usr/lib/locale/aa_ER@saaho/LC_NUMERIC
-#usr/lib/locale/aa_ER@saaho/LC_PAPER
-#usr/lib/locale/aa_ER@saaho/LC_TELEPHONE
-#usr/lib/locale/aa_ER@saaho/LC_TIME
#usr/lib/locale/aa_ET
#usr/lib/locale/aa_ET/LC_ADDRESS
#usr/lib/locale/aa_ET/LC_COLLATE
#usr/lib/locale/cmn_TW/LC_PAPER
#usr/lib/locale/cmn_TW/LC_TELEPHONE
#usr/lib/locale/cmn_TW/LC_TIME
+#usr/lib/locale/crh_RU
+#usr/lib/locale/crh_RU/LC_ADDRESS
+#usr/lib/locale/crh_RU/LC_COLLATE
+#usr/lib/locale/crh_RU/LC_CTYPE
+#usr/lib/locale/crh_RU/LC_IDENTIFICATION
+#usr/lib/locale/crh_RU/LC_MEASUREMENT
+#usr/lib/locale/crh_RU/LC_MESSAGES
+#usr/lib/locale/crh_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/crh_RU/LC_MONETARY
+#usr/lib/locale/crh_RU/LC_NAME
+#usr/lib/locale/crh_RU/LC_NUMERIC
+#usr/lib/locale/crh_RU/LC_PAPER
+#usr/lib/locale/crh_RU/LC_TELEPHONE
+#usr/lib/locale/crh_RU/LC_TIME
#usr/lib/locale/crh_UA
#usr/lib/locale/crh_UA/LC_ADDRESS
#usr/lib/locale/crh_UA/LC_COLLATE
#usr/lib/locale/ga_IE@euro/LC_PAPER
#usr/lib/locale/ga_IE@euro/LC_TELEPHONE
#usr/lib/locale/ga_IE@euro/LC_TIME
+#usr/lib/locale/gbm_IN
+#usr/lib/locale/gbm_IN/LC_ADDRESS
+#usr/lib/locale/gbm_IN/LC_COLLATE
+#usr/lib/locale/gbm_IN/LC_CTYPE
+#usr/lib/locale/gbm_IN/LC_IDENTIFICATION
+#usr/lib/locale/gbm_IN/LC_MEASUREMENT
+#usr/lib/locale/gbm_IN/LC_MESSAGES
+#usr/lib/locale/gbm_IN/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/gbm_IN/LC_MONETARY
+#usr/lib/locale/gbm_IN/LC_NAME
+#usr/lib/locale/gbm_IN/LC_NUMERIC
+#usr/lib/locale/gbm_IN/LC_PAPER
+#usr/lib/locale/gbm_IN/LC_TELEPHONE
+#usr/lib/locale/gbm_IN/LC_TIME
#usr/lib/locale/gd_GB
#usr/lib/locale/gd_GB.utf8
#usr/lib/locale/gd_GB.utf8/LC_ADDRESS
#usr/lib/locale/ku_TR/LC_PAPER
#usr/lib/locale/ku_TR/LC_TELEPHONE
#usr/lib/locale/ku_TR/LC_TIME
+#usr/lib/locale/kv_RU
+#usr/lib/locale/kv_RU/LC_ADDRESS
+#usr/lib/locale/kv_RU/LC_COLLATE
+#usr/lib/locale/kv_RU/LC_CTYPE
+#usr/lib/locale/kv_RU/LC_IDENTIFICATION
+#usr/lib/locale/kv_RU/LC_MEASUREMENT
+#usr/lib/locale/kv_RU/LC_MESSAGES
+#usr/lib/locale/kv_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/kv_RU/LC_MONETARY
+#usr/lib/locale/kv_RU/LC_NAME
+#usr/lib/locale/kv_RU/LC_NUMERIC
+#usr/lib/locale/kv_RU/LC_PAPER
+#usr/lib/locale/kv_RU/LC_TELEPHONE
+#usr/lib/locale/kv_RU/LC_TIME
#usr/lib/locale/kw_GB
#usr/lib/locale/kw_GB.utf8
#usr/lib/locale/kw_GB.utf8/LC_ADDRESS
#usr/lib/locale/ss_ZA/LC_PAPER
#usr/lib/locale/ss_ZA/LC_TELEPHONE
#usr/lib/locale/ss_ZA/LC_TIME
+#usr/lib/locale/ssy_ER
+#usr/lib/locale/ssy_ER/LC_ADDRESS
+#usr/lib/locale/ssy_ER/LC_COLLATE
+#usr/lib/locale/ssy_ER/LC_CTYPE
+#usr/lib/locale/ssy_ER/LC_IDENTIFICATION
+#usr/lib/locale/ssy_ER/LC_MEASUREMENT
+#usr/lib/locale/ssy_ER/LC_MESSAGES
+#usr/lib/locale/ssy_ER/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ssy_ER/LC_MONETARY
+#usr/lib/locale/ssy_ER/LC_NAME
+#usr/lib/locale/ssy_ER/LC_NUMERIC
+#usr/lib/locale/ssy_ER/LC_PAPER
+#usr/lib/locale/ssy_ER/LC_TELEPHONE
+#usr/lib/locale/ssy_ER/LC_TIME
#usr/lib/locale/st_ZA
#usr/lib/locale/st_ZA.utf8
#usr/lib/locale/st_ZA.utf8/LC_ADDRESS
#usr/lib/locale/st_ZA/LC_PAPER
#usr/lib/locale/st_ZA/LC_TELEPHONE
#usr/lib/locale/st_ZA/LC_TIME
+#usr/lib/locale/su_ID
+#usr/lib/locale/su_ID/LC_ADDRESS
+#usr/lib/locale/su_ID/LC_COLLATE
+#usr/lib/locale/su_ID/LC_CTYPE
+#usr/lib/locale/su_ID/LC_IDENTIFICATION
+#usr/lib/locale/su_ID/LC_MEASUREMENT
+#usr/lib/locale/su_ID/LC_MESSAGES
+#usr/lib/locale/su_ID/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/su_ID/LC_MONETARY
+#usr/lib/locale/su_ID/LC_NAME
+#usr/lib/locale/su_ID/LC_NUMERIC
+#usr/lib/locale/su_ID/LC_PAPER
+#usr/lib/locale/su_ID/LC_TELEPHONE
+#usr/lib/locale/su_ID/LC_TIME
#usr/lib/locale/sv_FI
#usr/lib/locale/sv_FI.utf8
#usr/lib/locale/sv_FI.utf8/LC_ADDRESS
#usr/lib/locale/to_TO/LC_PAPER
#usr/lib/locale/to_TO/LC_TELEPHONE
#usr/lib/locale/to_TO/LC_TIME
+#usr/lib/locale/tok
+#usr/lib/locale/tok/LC_ADDRESS
+#usr/lib/locale/tok/LC_COLLATE
+#usr/lib/locale/tok/LC_CTYPE
+#usr/lib/locale/tok/LC_IDENTIFICATION
+#usr/lib/locale/tok/LC_MEASUREMENT
+#usr/lib/locale/tok/LC_MESSAGES
+#usr/lib/locale/tok/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/tok/LC_MONETARY
+#usr/lib/locale/tok/LC_NAME
+#usr/lib/locale/tok/LC_NUMERIC
+#usr/lib/locale/tok/LC_PAPER
+#usr/lib/locale/tok/LC_TELEPHONE
+#usr/lib/locale/tok/LC_TIME
#usr/lib/locale/tpi_PG
#usr/lib/locale/tpi_PG/LC_ADDRESS
#usr/lib/locale/tpi_PG/LC_COLLATE
#usr/lib/locale/yuw_PG/LC_PAPER
#usr/lib/locale/yuw_PG/LC_TELEPHONE
#usr/lib/locale/yuw_PG/LC_TIME
+#usr/lib/locale/zgh_MA
+#usr/lib/locale/zgh_MA/LC_ADDRESS
+#usr/lib/locale/zgh_MA/LC_COLLATE
+#usr/lib/locale/zgh_MA/LC_CTYPE
+#usr/lib/locale/zgh_MA/LC_IDENTIFICATION
+#usr/lib/locale/zgh_MA/LC_MEASUREMENT
+#usr/lib/locale/zgh_MA/LC_MESSAGES
+#usr/lib/locale/zgh_MA/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/zgh_MA/LC_MONETARY
+#usr/lib/locale/zgh_MA/LC_NAME
+#usr/lib/locale/zgh_MA/LC_NUMERIC
+#usr/lib/locale/zgh_MA/LC_PAPER
+#usr/lib/locale/zgh_MA/LC_TELEPHONE
+#usr/lib/locale/zgh_MA/LC_TIME
#usr/lib/locale/zh_CN
#usr/lib/locale/zh_CN.gb18030
#usr/lib/locale/zh_CN.gb18030/LC_ADDRESS
#usr/share/i18n/locales/POSIX
#usr/share/i18n/locales/aa_DJ
#usr/share/i18n/locales/aa_ER
-#usr/share/i18n/locales/aa_ER@saaho
#usr/share/i18n/locales/aa_ET
#usr/share/i18n/locales/ab_GE
#usr/share/i18n/locales/af_ZA
#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
+#usr/share/i18n/locales/crh_RU
#usr/share/i18n/locales/crh_UA
#usr/share/i18n/locales/cs_CZ
#usr/share/i18n/locales/csb_PL
#usr/share/i18n/locales/fy_NL
#usr/share/i18n/locales/ga_IE
#usr/share/i18n/locales/ga_IE@euro
+#usr/share/i18n/locales/gbm_IN
#usr/share/i18n/locales/gd_GB
#usr/share/i18n/locales/gez_ER
#usr/share/i18n/locales/gez_ER@abegede
#usr/share/i18n/locales/ks_IN
#usr/share/i18n/locales/ks_IN@devanagari
#usr/share/i18n/locales/ku_TR
+#usr/share/i18n/locales/kv_RU
#usr/share/i18n/locales/kw_GB
#usr/share/i18n/locales/ky_KG
#usr/share/i18n/locales/lb_LU
#usr/share/i18n/locales/sr_RS
#usr/share/i18n/locales/sr_RS@latin
#usr/share/i18n/locales/ss_ZA
+#usr/share/i18n/locales/ssy_ER
#usr/share/i18n/locales/st_ZA
+#usr/share/i18n/locales/su_ID
#usr/share/i18n/locales/sv_FI
#usr/share/i18n/locales/sv_FI@euro
#usr/share/i18n/locales/sv_SE
#usr/share/i18n/locales/tl_PH
#usr/share/i18n/locales/tn_ZA
#usr/share/i18n/locales/to_TO
+#usr/share/i18n/locales/tok
#usr/share/i18n/locales/tpi_PG
#usr/share/i18n/locales/tr_CY
#usr/share/i18n/locales/tr_TR
#usr/share/i18n/locales/translit_cjk_variants
#usr/share/i18n/locales/translit_combining
#usr/share/i18n/locales/translit_compat
+#usr/share/i18n/locales/translit_emojis
#usr/share/i18n/locales/translit_font
#usr/share/i18n/locales/translit_fraction
#usr/share/i18n/locales/translit_hangul
#usr/share/i18n/locales/yo_NG
#usr/share/i18n/locales/yue_HK
#usr/share/i18n/locales/yuw_PG
+#usr/share/i18n/locales/zgh_MA
#usr/share/i18n/locales/zh_CN
#usr/share/i18n/locales/zh_HK
#usr/share/i18n/locales/zh_SG
#usr/share/info/libc.info-16
#usr/share/info/libc.info-17
#usr/share/info/libc.info-18
+#usr/share/info/libc.info-19
#usr/share/info/libc.info-2
#usr/share/info/libc.info-3
#usr/share/info/libc.info-4
#etc/rc.d/init.d/networking/red.up/35-guardian
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
+etc/rc.d/init.d/networking/red.up/60-collectd
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2645198
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2658417
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2966298
+#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_3117295
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319
#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_CLEAN_CACHE
#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_REPEAT_TLBI
#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_AT
+#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD
#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_TSB_FLUSH_FAILURE
#lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_CLK
#lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_WATCHDOG
#lib/modules/KVER-ipfire/build/include/config/LEDS_TRIGGER_TTY
#lib/modules/KVER-ipfire/build/include/config/LED_TRIGGER_PHY
#lib/modules/KVER-ipfire/build/include/config/LEGACY_DIRECT_IO
-#lib/modules/KVER-ipfire/build/include/config/LEGACY_TIOCSTI
#lib/modules/KVER-ipfire/build/include/config/LIB80211
#lib/modules/KVER-ipfire/build/include/config/LIB80211_CRYPT_CCMP
#lib/modules/KVER-ipfire/build/include/config/LIB80211_CRYPT_TKIP
--- /dev/null
+#usr/include/absl
+#usr/include/absl/CMakeFiles
+#usr/include/absl/algorithm
+#usr/include/absl/algorithm/CMakeFiles
+#usr/include/absl/algorithm/algorithm.h
+#usr/include/absl/algorithm/container.h
+#usr/include/absl/base
+#usr/include/absl/base/CMakeFiles
+#usr/include/absl/base/CMakeFiles/base.dir
+#usr/include/absl/base/CMakeFiles/base.dir/internal
+#usr/include/absl/base/CMakeFiles/log_severity.dir
+#usr/include/absl/base/CMakeFiles/malloc_internal.dir
+#usr/include/absl/base/CMakeFiles/malloc_internal.dir/internal
+#usr/include/absl/base/CMakeFiles/raw_logging_internal.dir
+#usr/include/absl/base/CMakeFiles/raw_logging_internal.dir/internal
+#usr/include/absl/base/CMakeFiles/scoped_set_env.dir
+#usr/include/absl/base/CMakeFiles/scoped_set_env.dir/internal
+#usr/include/absl/base/CMakeFiles/spinlock_wait.dir
+#usr/include/absl/base/CMakeFiles/spinlock_wait.dir/internal
+#usr/include/absl/base/CMakeFiles/strerror.dir
+#usr/include/absl/base/CMakeFiles/strerror.dir/internal
+#usr/include/absl/base/CMakeFiles/throw_delegate.dir
+#usr/include/absl/base/CMakeFiles/throw_delegate.dir/internal
+#usr/include/absl/base/attributes.h
+#usr/include/absl/base/call_once.h
+#usr/include/absl/base/casts.h
+#usr/include/absl/base/config.h
+#usr/include/absl/base/const_init.h
+#usr/include/absl/base/dynamic_annotations.h
+#usr/include/absl/base/internal
+#usr/include/absl/base/internal/atomic_hook.h
+#usr/include/absl/base/internal/atomic_hook_test_helper.h
+#usr/include/absl/base/internal/cycleclock.h
+#usr/include/absl/base/internal/cycleclock_config.h
+#usr/include/absl/base/internal/direct_mmap.h
+#usr/include/absl/base/internal/dynamic_annotations.h
+#usr/include/absl/base/internal/endian.h
+#usr/include/absl/base/internal/errno_saver.h
+#usr/include/absl/base/internal/exception_safety_testing.h
+#usr/include/absl/base/internal/exception_testing.h
+#usr/include/absl/base/internal/fast_type_id.h
+#usr/include/absl/base/internal/hide_ptr.h
+#usr/include/absl/base/internal/identity.h
+#usr/include/absl/base/internal/inline_variable.h
+#usr/include/absl/base/internal/inline_variable_testing.h
+#usr/include/absl/base/internal/invoke.h
+#usr/include/absl/base/internal/low_level_alloc.h
+#usr/include/absl/base/internal/low_level_scheduling.h
+#usr/include/absl/base/internal/nullability_impl.h
+#usr/include/absl/base/internal/per_thread_tls.h
+#usr/include/absl/base/internal/prefetch.h
+#usr/include/absl/base/internal/pretty_function.h
+#usr/include/absl/base/internal/raw_logging.h
+#usr/include/absl/base/internal/scheduling_mode.h
+#usr/include/absl/base/internal/scoped_set_env.h
+#usr/include/absl/base/internal/spinlock.h
+#usr/include/absl/base/internal/spinlock_akaros.inc
+#usr/include/absl/base/internal/spinlock_linux.inc
+#usr/include/absl/base/internal/spinlock_posix.inc
+#usr/include/absl/base/internal/spinlock_wait.h
+#usr/include/absl/base/internal/spinlock_win32.inc
+#usr/include/absl/base/internal/strerror.h
+#usr/include/absl/base/internal/sysinfo.h
+#usr/include/absl/base/internal/thread_annotations.h
+#usr/include/absl/base/internal/thread_identity.h
+#usr/include/absl/base/internal/throw_delegate.h
+#usr/include/absl/base/internal/tsan_mutex_interface.h
+#usr/include/absl/base/internal/unaligned_access.h
+#usr/include/absl/base/internal/unscaledcycleclock.h
+#usr/include/absl/base/internal/unscaledcycleclock_config.h
+#usr/include/absl/base/log_severity.h
+#usr/include/absl/base/macros.h
+#usr/include/absl/base/nullability.h
+#usr/include/absl/base/optimization.h
+#usr/include/absl/base/options.h
+#usr/include/absl/base/policy_checks.h
+#usr/include/absl/base/port.h
+#usr/include/absl/base/prefetch.h
+#usr/include/absl/base/thread_annotations.h
+#usr/include/absl/cleanup
+#usr/include/absl/cleanup/CMakeFiles
+#usr/include/absl/cleanup/cleanup.h
+#usr/include/absl/cleanup/internal
+#usr/include/absl/cleanup/internal/cleanup.h
+#usr/include/absl/container
+#usr/include/absl/container/CMakeFiles
+#usr/include/absl/container/CMakeFiles/hashtablez_sampler.dir
+#usr/include/absl/container/CMakeFiles/hashtablez_sampler.dir/internal
+#usr/include/absl/container/CMakeFiles/raw_hash_set.dir
+#usr/include/absl/container/CMakeFiles/raw_hash_set.dir/internal
+#usr/include/absl/container/btree_map.h
+#usr/include/absl/container/btree_set.h
+#usr/include/absl/container/btree_test.h
+#usr/include/absl/container/fixed_array.h
+#usr/include/absl/container/flat_hash_map.h
+#usr/include/absl/container/flat_hash_set.h
+#usr/include/absl/container/inlined_vector.h
+#usr/include/absl/container/internal
+#usr/include/absl/container/internal/btree.h
+#usr/include/absl/container/internal/btree_container.h
+#usr/include/absl/container/internal/common.h
+#usr/include/absl/container/internal/common_policy_traits.h
+#usr/include/absl/container/internal/compressed_tuple.h
+#usr/include/absl/container/internal/container_memory.h
+#usr/include/absl/container/internal/counting_allocator.h
+#usr/include/absl/container/internal/hash_function_defaults.h
+#usr/include/absl/container/internal/hash_generator_testing.h
+#usr/include/absl/container/internal/hash_policy_testing.h
+#usr/include/absl/container/internal/hash_policy_traits.h
+#usr/include/absl/container/internal/hashtable_debug.h
+#usr/include/absl/container/internal/hashtable_debug_hooks.h
+#usr/include/absl/container/internal/hashtablez_sampler.h
+#usr/include/absl/container/internal/inlined_vector.h
+#usr/include/absl/container/internal/layout.h
+#usr/include/absl/container/internal/node_slot_policy.h
+#usr/include/absl/container/internal/raw_hash_map.h
+#usr/include/absl/container/internal/raw_hash_set.h
+#usr/include/absl/container/internal/test_instance_tracker.h
+#usr/include/absl/container/internal/tracked.h
+#usr/include/absl/container/internal/unordered_map_constructor_test.h
+#usr/include/absl/container/internal/unordered_map_lookup_test.h
+#usr/include/absl/container/internal/unordered_map_members_test.h
+#usr/include/absl/container/internal/unordered_map_modifiers_test.h
+#usr/include/absl/container/internal/unordered_set_constructor_test.h
+#usr/include/absl/container/internal/unordered_set_lookup_test.h
+#usr/include/absl/container/internal/unordered_set_members_test.h
+#usr/include/absl/container/internal/unordered_set_modifiers_test.h
+#usr/include/absl/container/node_hash_map.h
+#usr/include/absl/container/node_hash_set.h
+#usr/include/absl/crc
+#usr/include/absl/crc/CMakeFiles
+#usr/include/absl/crc/CMakeFiles/crc32c.dir
+#usr/include/absl/crc/CMakeFiles/crc32c.dir/internal
+#usr/include/absl/crc/CMakeFiles/crc_cord_state.dir
+#usr/include/absl/crc/CMakeFiles/crc_cord_state.dir/internal
+#usr/include/absl/crc/CMakeFiles/crc_cpu_detect.dir
+#usr/include/absl/crc/CMakeFiles/crc_cpu_detect.dir/internal
+#usr/include/absl/crc/CMakeFiles/crc_internal.dir
+#usr/include/absl/crc/CMakeFiles/crc_internal.dir/internal
+#usr/include/absl/crc/crc32c.h
+#usr/include/absl/crc/internal
+#usr/include/absl/crc/internal/cpu_detect.h
+#usr/include/absl/crc/internal/crc.h
+#usr/include/absl/crc/internal/crc32_x86_arm_combined_simd.h
+#usr/include/absl/crc/internal/crc32c.h
+#usr/include/absl/crc/internal/crc32c_inline.h
+#usr/include/absl/crc/internal/crc_cord_state.h
+#usr/include/absl/crc/internal/crc_internal.h
+#usr/include/absl/crc/internal/crc_memcpy.h
+#usr/include/absl/crc/internal/non_temporal_arm_intrinsics.h
+#usr/include/absl/crc/internal/non_temporal_memcpy.h
+#usr/include/absl/debugging
+#usr/include/absl/debugging/CMakeFiles
+#usr/include/absl/debugging/CMakeFiles/debugging_internal.dir
+#usr/include/absl/debugging/CMakeFiles/debugging_internal.dir/internal
+#usr/include/absl/debugging/CMakeFiles/demangle_internal.dir
+#usr/include/absl/debugging/CMakeFiles/demangle_internal.dir/internal
+#usr/include/absl/debugging/CMakeFiles/examine_stack.dir
+#usr/include/absl/debugging/CMakeFiles/examine_stack.dir/internal
+#usr/include/absl/debugging/CMakeFiles/failure_signal_handler.dir
+#usr/include/absl/debugging/CMakeFiles/leak_check.dir
+#usr/include/absl/debugging/CMakeFiles/stacktrace.dir
+#usr/include/absl/debugging/CMakeFiles/symbolize.dir
+#usr/include/absl/debugging/failure_signal_handler.h
+#usr/include/absl/debugging/internal
+#usr/include/absl/debugging/internal/address_is_readable.h
+#usr/include/absl/debugging/internal/demangle.h
+#usr/include/absl/debugging/internal/elf_mem_image.h
+#usr/include/absl/debugging/internal/examine_stack.h
+#usr/include/absl/debugging/internal/stack_consumption.h
+#usr/include/absl/debugging/internal/stacktrace_aarch64-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_arm-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_config.h
+#usr/include/absl/debugging/internal/stacktrace_emscripten-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_generic-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_powerpc-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_riscv-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_unimplemented-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_win32-inl.inc
+#usr/include/absl/debugging/internal/stacktrace_x86-inl.inc
+#usr/include/absl/debugging/internal/symbolize.h
+#usr/include/absl/debugging/internal/vdso_support.h
+#usr/include/absl/debugging/leak_check.h
+#usr/include/absl/debugging/stacktrace.h
+#usr/include/absl/debugging/symbolize.h
+#usr/include/absl/debugging/symbolize_darwin.inc
+#usr/include/absl/debugging/symbolize_elf.inc
+#usr/include/absl/debugging/symbolize_emscripten.inc
+#usr/include/absl/debugging/symbolize_unimplemented.inc
+#usr/include/absl/debugging/symbolize_win32.inc
+#usr/include/absl/flags
+#usr/include/absl/flags/CMakeFiles
+#usr/include/absl/flags/CMakeFiles/flags.dir
+#usr/include/absl/flags/CMakeFiles/flags_commandlineflag.dir
+#usr/include/absl/flags/CMakeFiles/flags_commandlineflag_internal.dir
+#usr/include/absl/flags/CMakeFiles/flags_commandlineflag_internal.dir/internal
+#usr/include/absl/flags/CMakeFiles/flags_config.dir
+#usr/include/absl/flags/CMakeFiles/flags_internal.dir
+#usr/include/absl/flags/CMakeFiles/flags_internal.dir/internal
+#usr/include/absl/flags/CMakeFiles/flags_marshalling.dir
+#usr/include/absl/flags/CMakeFiles/flags_parse.dir
+#usr/include/absl/flags/CMakeFiles/flags_private_handle_accessor.dir
+#usr/include/absl/flags/CMakeFiles/flags_private_handle_accessor.dir/internal
+#usr/include/absl/flags/CMakeFiles/flags_program_name.dir
+#usr/include/absl/flags/CMakeFiles/flags_program_name.dir/internal
+#usr/include/absl/flags/CMakeFiles/flags_reflection.dir
+#usr/include/absl/flags/CMakeFiles/flags_usage.dir
+#usr/include/absl/flags/CMakeFiles/flags_usage_internal.dir
+#usr/include/absl/flags/CMakeFiles/flags_usage_internal.dir/internal
+#usr/include/absl/flags/commandlineflag.h
+#usr/include/absl/flags/config.h
+#usr/include/absl/flags/declare.h
+#usr/include/absl/flags/flag.h
+#usr/include/absl/flags/internal
+#usr/include/absl/flags/internal/commandlineflag.h
+#usr/include/absl/flags/internal/flag.h
+#usr/include/absl/flags/internal/flag_msvc.inc
+#usr/include/absl/flags/internal/parse.h
+#usr/include/absl/flags/internal/path_util.h
+#usr/include/absl/flags/internal/private_handle_accessor.h
+#usr/include/absl/flags/internal/program_name.h
+#usr/include/absl/flags/internal/registry.h
+#usr/include/absl/flags/internal/sequence_lock.h
+#usr/include/absl/flags/internal/usage.h
+#usr/include/absl/flags/marshalling.h
+#usr/include/absl/flags/parse.h
+#usr/include/absl/flags/reflection.h
+#usr/include/absl/flags/usage.h
+#usr/include/absl/flags/usage_config.h
+#usr/include/absl/functional
+#usr/include/absl/functional/CMakeFiles
+#usr/include/absl/functional/any_invocable.h
+#usr/include/absl/functional/bind_front.h
+#usr/include/absl/functional/function_ref.h
+#usr/include/absl/functional/internal
+#usr/include/absl/functional/internal/any_invocable.h
+#usr/include/absl/functional/internal/front_binder.h
+#usr/include/absl/functional/internal/function_ref.h
+#usr/include/absl/hash
+#usr/include/absl/hash/CMakeFiles
+#usr/include/absl/hash/CMakeFiles/city.dir
+#usr/include/absl/hash/CMakeFiles/city.dir/internal
+#usr/include/absl/hash/CMakeFiles/hash.dir
+#usr/include/absl/hash/CMakeFiles/hash.dir/internal
+#usr/include/absl/hash/CMakeFiles/low_level_hash.dir
+#usr/include/absl/hash/CMakeFiles/low_level_hash.dir/internal
+#usr/include/absl/hash/hash.h
+#usr/include/absl/hash/hash_testing.h
+#usr/include/absl/hash/internal
+#usr/include/absl/hash/internal/city.h
+#usr/include/absl/hash/internal/hash.h
+#usr/include/absl/hash/internal/hash_test.h
+#usr/include/absl/hash/internal/low_level_hash.h
+#usr/include/absl/hash/internal/spy_hash_state.h
+#usr/include/absl/log
+#usr/include/absl/log/CMakeFiles
+#usr/include/absl/log/CMakeFiles/die_if_null.dir
+#usr/include/absl/log/CMakeFiles/log_entry.dir
+#usr/include/absl/log/CMakeFiles/log_flags.dir
+#usr/include/absl/log/CMakeFiles/log_globals.dir
+#usr/include/absl/log/CMakeFiles/log_initialize.dir
+#usr/include/absl/log/CMakeFiles/log_internal_check_op.dir
+#usr/include/absl/log/CMakeFiles/log_internal_check_op.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_conditions.dir
+#usr/include/absl/log/CMakeFiles/log_internal_conditions.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_format.dir
+#usr/include/absl/log/CMakeFiles/log_internal_format.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_globals.dir
+#usr/include/absl/log/CMakeFiles/log_internal_globals.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_log_sink_set.dir
+#usr/include/absl/log/CMakeFiles/log_internal_log_sink_set.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_message.dir
+#usr/include/absl/log/CMakeFiles/log_internal_message.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_nullguard.dir
+#usr/include/absl/log/CMakeFiles/log_internal_nullguard.dir/internal
+#usr/include/absl/log/CMakeFiles/log_internal_proto.dir
+#usr/include/absl/log/CMakeFiles/log_internal_proto.dir/internal
+#usr/include/absl/log/CMakeFiles/log_sink.dir
+#usr/include/absl/log/absl_check.h
+#usr/include/absl/log/absl_log.h
+#usr/include/absl/log/check.h
+#usr/include/absl/log/check_test_impl.inc
+#usr/include/absl/log/die_if_null.h
+#usr/include/absl/log/flags.h
+#usr/include/absl/log/globals.h
+#usr/include/absl/log/initialize.h
+#usr/include/absl/log/internal
+#usr/include/absl/log/internal/append_truncated.h
+#usr/include/absl/log/internal/check_impl.h
+#usr/include/absl/log/internal/check_op.h
+#usr/include/absl/log/internal/conditions.h
+#usr/include/absl/log/internal/config.h
+#usr/include/absl/log/internal/flags.h
+#usr/include/absl/log/internal/globals.h
+#usr/include/absl/log/internal/log_format.h
+#usr/include/absl/log/internal/log_impl.h
+#usr/include/absl/log/internal/log_message.h
+#usr/include/absl/log/internal/log_sink_set.h
+#usr/include/absl/log/internal/nullguard.h
+#usr/include/absl/log/internal/nullstream.h
+#usr/include/absl/log/internal/proto.h
+#usr/include/absl/log/internal/strip.h
+#usr/include/absl/log/internal/structured.h
+#usr/include/absl/log/internal/test_actions.h
+#usr/include/absl/log/internal/test_helpers.h
+#usr/include/absl/log/internal/test_matchers.h
+#usr/include/absl/log/internal/voidify.h
+#usr/include/absl/log/log.h
+#usr/include/absl/log/log_basic_test_impl.inc
+#usr/include/absl/log/log_entry.h
+#usr/include/absl/log/log_sink.h
+#usr/include/absl/log/log_sink_registry.h
+#usr/include/absl/log/log_streamer.h
+#usr/include/absl/log/scoped_mock_log.h
+#usr/include/absl/log/structured.h
+#usr/include/absl/memory
+#usr/include/absl/memory/CMakeFiles
+#usr/include/absl/memory/memory.h
+#usr/include/absl/meta
+#usr/include/absl/meta/CMakeFiles
+#usr/include/absl/meta/type_traits.h
+#usr/include/absl/numeric
+#usr/include/absl/numeric/CMakeFiles
+#usr/include/absl/numeric/CMakeFiles/int128.dir
+#usr/include/absl/numeric/bits.h
+#usr/include/absl/numeric/int128.h
+#usr/include/absl/numeric/int128_have_intrinsic.inc
+#usr/include/absl/numeric/int128_no_intrinsic.inc
+#usr/include/absl/numeric/internal
+#usr/include/absl/numeric/internal/bits.h
+#usr/include/absl/numeric/internal/representation.h
+#usr/include/absl/profiling
+#usr/include/absl/profiling/CMakeFiles
+#usr/include/absl/profiling/CMakeFiles/exponential_biased.dir
+#usr/include/absl/profiling/CMakeFiles/exponential_biased.dir/internal
+#usr/include/absl/profiling/CMakeFiles/periodic_sampler.dir
+#usr/include/absl/profiling/CMakeFiles/periodic_sampler.dir/internal
+#usr/include/absl/profiling/internal
+#usr/include/absl/profiling/internal/exponential_biased.h
+#usr/include/absl/profiling/internal/periodic_sampler.h
+#usr/include/absl/profiling/internal/sample_recorder.h
+#usr/include/absl/random
+#usr/include/absl/random/CMakeFiles
+#usr/include/absl/random/CMakeFiles/random_distributions.dir
+#usr/include/absl/random/CMakeFiles/random_internal_distribution_test_util.dir
+#usr/include/absl/random/CMakeFiles/random_internal_distribution_test_util.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_platform.dir
+#usr/include/absl/random/CMakeFiles/random_internal_platform.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_pool_urbg.dir
+#usr/include/absl/random/CMakeFiles/random_internal_pool_urbg.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_randen.dir
+#usr/include/absl/random/CMakeFiles/random_internal_randen.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_randen_hwaes.dir
+#usr/include/absl/random/CMakeFiles/random_internal_randen_hwaes.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_randen_hwaes_impl.dir
+#usr/include/absl/random/CMakeFiles/random_internal_randen_hwaes_impl.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_randen_slow.dir
+#usr/include/absl/random/CMakeFiles/random_internal_randen_slow.dir/internal
+#usr/include/absl/random/CMakeFiles/random_internal_seed_material.dir
+#usr/include/absl/random/CMakeFiles/random_internal_seed_material.dir/internal
+#usr/include/absl/random/CMakeFiles/random_seed_gen_exception.dir
+#usr/include/absl/random/CMakeFiles/random_seed_sequences.dir
+#usr/include/absl/random/bernoulli_distribution.h
+#usr/include/absl/random/beta_distribution.h
+#usr/include/absl/random/bit_gen_ref.h
+#usr/include/absl/random/discrete_distribution.h
+#usr/include/absl/random/distributions.h
+#usr/include/absl/random/exponential_distribution.h
+#usr/include/absl/random/gaussian_distribution.h
+#usr/include/absl/random/internal
+#usr/include/absl/random/internal/chi_square.h
+#usr/include/absl/random/internal/distribution_caller.h
+#usr/include/absl/random/internal/distribution_test_util.h
+#usr/include/absl/random/internal/explicit_seed_seq.h
+#usr/include/absl/random/internal/fast_uniform_bits.h
+#usr/include/absl/random/internal/fastmath.h
+#usr/include/absl/random/internal/generate_real.h
+#usr/include/absl/random/internal/iostream_state_saver.h
+#usr/include/absl/random/internal/mock_helpers.h
+#usr/include/absl/random/internal/mock_overload_set.h
+#usr/include/absl/random/internal/nanobenchmark.h
+#usr/include/absl/random/internal/nonsecure_base.h
+#usr/include/absl/random/internal/pcg_engine.h
+#usr/include/absl/random/internal/platform.h
+#usr/include/absl/random/internal/pool_urbg.h
+#usr/include/absl/random/internal/randen.h
+#usr/include/absl/random/internal/randen_detect.h
+#usr/include/absl/random/internal/randen_engine.h
+#usr/include/absl/random/internal/randen_hwaes.h
+#usr/include/absl/random/internal/randen_slow.h
+#usr/include/absl/random/internal/randen_traits.h
+#usr/include/absl/random/internal/salted_seed_seq.h
+#usr/include/absl/random/internal/seed_material.h
+#usr/include/absl/random/internal/sequence_urbg.h
+#usr/include/absl/random/internal/traits.h
+#usr/include/absl/random/internal/uniform_helper.h
+#usr/include/absl/random/internal/wide_multiply.h
+#usr/include/absl/random/log_uniform_int_distribution.h
+#usr/include/absl/random/mock_distributions.h
+#usr/include/absl/random/mocking_bit_gen.h
+#usr/include/absl/random/poisson_distribution.h
+#usr/include/absl/random/random.h
+#usr/include/absl/random/seed_gen_exception.h
+#usr/include/absl/random/seed_sequences.h
+#usr/include/absl/random/uniform_int_distribution.h
+#usr/include/absl/random/uniform_real_distribution.h
+#usr/include/absl/random/zipf_distribution.h
+#usr/include/absl/status
+#usr/include/absl/status/CMakeFiles
+#usr/include/absl/status/CMakeFiles/status.dir
+#usr/include/absl/status/CMakeFiles/statusor.dir
+#usr/include/absl/status/internal
+#usr/include/absl/status/internal/status_internal.h
+#usr/include/absl/status/internal/statusor_internal.h
+#usr/include/absl/status/status.h
+#usr/include/absl/status/status_payload_printer.h
+#usr/include/absl/status/statusor.h
+#usr/include/absl/strings
+#usr/include/absl/strings/CMakeFiles
+#usr/include/absl/strings/CMakeFiles/cord.dir
+#usr/include/absl/strings/CMakeFiles/cord_internal.dir
+#usr/include/absl/strings/CMakeFiles/cord_internal.dir/internal
+#usr/include/absl/strings/CMakeFiles/cordz_functions.dir
+#usr/include/absl/strings/CMakeFiles/cordz_functions.dir/internal
+#usr/include/absl/strings/CMakeFiles/cordz_handle.dir
+#usr/include/absl/strings/CMakeFiles/cordz_handle.dir/internal
+#usr/include/absl/strings/CMakeFiles/cordz_info.dir
+#usr/include/absl/strings/CMakeFiles/cordz_info.dir/internal
+#usr/include/absl/strings/CMakeFiles/cordz_sample_token.dir
+#usr/include/absl/strings/CMakeFiles/cordz_sample_token.dir/internal
+#usr/include/absl/strings/CMakeFiles/str_format_internal.dir
+#usr/include/absl/strings/CMakeFiles/str_format_internal.dir/internal
+#usr/include/absl/strings/CMakeFiles/str_format_internal.dir/internal/str_format
+#usr/include/absl/strings/CMakeFiles/string_view.dir
+#usr/include/absl/strings/CMakeFiles/strings.dir
+#usr/include/absl/strings/CMakeFiles/strings.dir/internal
+#usr/include/absl/strings/CMakeFiles/strings_internal.dir
+#usr/include/absl/strings/CMakeFiles/strings_internal.dir/internal
+#usr/include/absl/strings/ascii.h
+#usr/include/absl/strings/charconv.h
+#usr/include/absl/strings/cord.h
+#usr/include/absl/strings/cord_analysis.h
+#usr/include/absl/strings/cord_buffer.h
+#usr/include/absl/strings/cord_test_helpers.h
+#usr/include/absl/strings/cordz_test_helpers.h
+#usr/include/absl/strings/escaping.h
+#usr/include/absl/strings/internal
+#usr/include/absl/strings/internal/char_map.h
+#usr/include/absl/strings/internal/charconv_bigint.h
+#usr/include/absl/strings/internal/charconv_parse.h
+#usr/include/absl/strings/internal/cord_data_edge.h
+#usr/include/absl/strings/internal/cord_internal.h
+#usr/include/absl/strings/internal/cord_rep_btree.h
+#usr/include/absl/strings/internal/cord_rep_btree_navigator.h
+#usr/include/absl/strings/internal/cord_rep_btree_reader.h
+#usr/include/absl/strings/internal/cord_rep_consume.h
+#usr/include/absl/strings/internal/cord_rep_crc.h
+#usr/include/absl/strings/internal/cord_rep_flat.h
+#usr/include/absl/strings/internal/cord_rep_ring.h
+#usr/include/absl/strings/internal/cord_rep_ring_reader.h
+#usr/include/absl/strings/internal/cord_rep_test_util.h
+#usr/include/absl/strings/internal/cordz_functions.h
+#usr/include/absl/strings/internal/cordz_handle.h
+#usr/include/absl/strings/internal/cordz_info.h
+#usr/include/absl/strings/internal/cordz_sample_token.h
+#usr/include/absl/strings/internal/cordz_statistics.h
+#usr/include/absl/strings/internal/cordz_update_scope.h
+#usr/include/absl/strings/internal/cordz_update_tracker.h
+#usr/include/absl/strings/internal/damerau_levenshtein_distance.h
+#usr/include/absl/strings/internal/escaping.h
+#usr/include/absl/strings/internal/escaping_test_common.h
+#usr/include/absl/strings/internal/has_absl_stringify.h
+#usr/include/absl/strings/internal/memutil.h
+#usr/include/absl/strings/internal/numbers_test_common.h
+#usr/include/absl/strings/internal/ostringstream.h
+#usr/include/absl/strings/internal/pow10_helper.h
+#usr/include/absl/strings/internal/resize_uninitialized.h
+#usr/include/absl/strings/internal/stl_type_traits.h
+#usr/include/absl/strings/internal/str_format
+#usr/include/absl/strings/internal/str_format/arg.h
+#usr/include/absl/strings/internal/str_format/bind.h
+#usr/include/absl/strings/internal/str_format/checker.h
+#usr/include/absl/strings/internal/str_format/constexpr_parser.h
+#usr/include/absl/strings/internal/str_format/extension.h
+#usr/include/absl/strings/internal/str_format/float_conversion.h
+#usr/include/absl/strings/internal/str_format/output.h
+#usr/include/absl/strings/internal/str_format/parser.h
+#usr/include/absl/strings/internal/str_join_internal.h
+#usr/include/absl/strings/internal/str_split_internal.h
+#usr/include/absl/strings/internal/string_constant.h
+#usr/include/absl/strings/internal/stringify_sink.h
+#usr/include/absl/strings/internal/utf8.h
+#usr/include/absl/strings/match.h
+#usr/include/absl/strings/numbers.h
+#usr/include/absl/strings/str_cat.h
+#usr/include/absl/strings/str_format.h
+#usr/include/absl/strings/str_join.h
+#usr/include/absl/strings/str_replace.h
+#usr/include/absl/strings/str_split.h
+#usr/include/absl/strings/string_view.h
+#usr/include/absl/strings/strip.h
+#usr/include/absl/strings/substitute.h
+#usr/include/absl/synchronization
+#usr/include/absl/synchronization/CMakeFiles
+#usr/include/absl/synchronization/CMakeFiles/graphcycles_internal.dir
+#usr/include/absl/synchronization/CMakeFiles/graphcycles_internal.dir/internal
+#usr/include/absl/synchronization/CMakeFiles/kernel_timeout_internal.dir
+#usr/include/absl/synchronization/CMakeFiles/kernel_timeout_internal.dir/internal
+#usr/include/absl/synchronization/CMakeFiles/synchronization.dir
+#usr/include/absl/synchronization/CMakeFiles/synchronization.dir/internal
+#usr/include/absl/synchronization/barrier.h
+#usr/include/absl/synchronization/blocking_counter.h
+#usr/include/absl/synchronization/internal
+#usr/include/absl/synchronization/internal/create_thread_identity.h
+#usr/include/absl/synchronization/internal/futex.h
+#usr/include/absl/synchronization/internal/futex_waiter.h
+#usr/include/absl/synchronization/internal/graphcycles.h
+#usr/include/absl/synchronization/internal/kernel_timeout.h
+#usr/include/absl/synchronization/internal/per_thread_sem.h
+#usr/include/absl/synchronization/internal/pthread_waiter.h
+#usr/include/absl/synchronization/internal/sem_waiter.h
+#usr/include/absl/synchronization/internal/stdcpp_waiter.h
+#usr/include/absl/synchronization/internal/thread_pool.h
+#usr/include/absl/synchronization/internal/waiter.h
+#usr/include/absl/synchronization/internal/waiter_base.h
+#usr/include/absl/synchronization/internal/win32_waiter.h
+#usr/include/absl/synchronization/mutex.h
+#usr/include/absl/synchronization/notification.h
+#usr/include/absl/time
+#usr/include/absl/time/CMakeFiles
+#usr/include/absl/time/CMakeFiles/civil_time.dir
+#usr/include/absl/time/CMakeFiles/civil_time.dir/internal
+#usr/include/absl/time/CMakeFiles/civil_time.dir/internal/cctz
+#usr/include/absl/time/CMakeFiles/civil_time.dir/internal/cctz/src
+#usr/include/absl/time/CMakeFiles/time.dir
+#usr/include/absl/time/CMakeFiles/time_zone.dir
+#usr/include/absl/time/CMakeFiles/time_zone.dir/internal
+#usr/include/absl/time/CMakeFiles/time_zone.dir/internal/cctz
+#usr/include/absl/time/CMakeFiles/time_zone.dir/internal/cctz/src
+#usr/include/absl/time/civil_time.h
+#usr/include/absl/time/clock.h
+#usr/include/absl/time/internal
+#usr/include/absl/time/internal/cctz
+#usr/include/absl/time/internal/cctz/include
+#usr/include/absl/time/internal/cctz/include/cctz
+#usr/include/absl/time/internal/cctz/include/cctz/civil_time.h
+#usr/include/absl/time/internal/cctz/include/cctz/civil_time_detail.h
+#usr/include/absl/time/internal/cctz/include/cctz/time_zone.h
+#usr/include/absl/time/internal/cctz/include/cctz/zone_info_source.h
+#usr/include/absl/time/internal/cctz/src
+#usr/include/absl/time/internal/cctz/src/time_zone_fixed.h
+#usr/include/absl/time/internal/cctz/src/time_zone_if.h
+#usr/include/absl/time/internal/cctz/src/time_zone_impl.h
+#usr/include/absl/time/internal/cctz/src/time_zone_info.h
+#usr/include/absl/time/internal/cctz/src/time_zone_libc.h
+#usr/include/absl/time/internal/cctz/src/time_zone_posix.h
+#usr/include/absl/time/internal/cctz/src/tzfile.h
+#usr/include/absl/time/internal/get_current_time_chrono.inc
+#usr/include/absl/time/internal/get_current_time_posix.inc
+#usr/include/absl/time/internal/test_util.h
+#usr/include/absl/time/time.h
+#usr/include/absl/types
+#usr/include/absl/types/CMakeFiles
+#usr/include/absl/types/CMakeFiles/bad_any_cast_impl.dir
+#usr/include/absl/types/CMakeFiles/bad_optional_access.dir
+#usr/include/absl/types/CMakeFiles/bad_variant_access.dir
+#usr/include/absl/types/any.h
+#usr/include/absl/types/bad_any_cast.h
+#usr/include/absl/types/bad_optional_access.h
+#usr/include/absl/types/bad_variant_access.h
+#usr/include/absl/types/compare.h
+#usr/include/absl/types/internal
+#usr/include/absl/types/internal/conformance_aliases.h
+#usr/include/absl/types/internal/conformance_archetype.h
+#usr/include/absl/types/internal/conformance_profile.h
+#usr/include/absl/types/internal/conformance_testing.h
+#usr/include/absl/types/internal/conformance_testing_helpers.h
+#usr/include/absl/types/internal/optional.h
+#usr/include/absl/types/internal/parentheses.h
+#usr/include/absl/types/internal/span.h
+#usr/include/absl/types/internal/transform_args.h
+#usr/include/absl/types/internal/variant.h
+#usr/include/absl/types/optional.h
+#usr/include/absl/types/span.h
+#usr/include/absl/types/variant.h
+#usr/include/absl/utility
+#usr/include/absl/utility/CMakeFiles
+#usr/include/absl/utility/internal
+#usr/include/absl/utility/internal/if_constexpr.h
+#usr/include/absl/utility/utility.h
+#usr/lib/cmake/absl
+#usr/lib/cmake/absl/abslConfig.cmake
+#usr/lib/cmake/absl/abslConfigVersion.cmake
+#usr/lib/cmake/absl/abslTargets-noconfig.cmake
+#usr/lib/cmake/absl/abslTargets.cmake
+#usr/lib/libabsl_bad_any_cast_impl.a
+#usr/lib/libabsl_bad_optional_access.a
+#usr/lib/libabsl_bad_variant_access.a
+#usr/lib/libabsl_base.a
+#usr/lib/libabsl_city.a
+#usr/lib/libabsl_civil_time.a
+#usr/lib/libabsl_cord.a
+#usr/lib/libabsl_cord_internal.a
+#usr/lib/libabsl_cordz_functions.a
+#usr/lib/libabsl_cordz_handle.a
+#usr/lib/libabsl_cordz_info.a
+#usr/lib/libabsl_cordz_sample_token.a
+#usr/lib/libabsl_crc32c.a
+#usr/lib/libabsl_crc_cord_state.a
+#usr/lib/libabsl_crc_cpu_detect.a
+#usr/lib/libabsl_crc_internal.a
+#usr/lib/libabsl_debugging_internal.a
+#usr/lib/libabsl_demangle_internal.a
+#usr/lib/libabsl_die_if_null.a
+#usr/lib/libabsl_examine_stack.a
+#usr/lib/libabsl_exponential_biased.a
+#usr/lib/libabsl_failure_signal_handler.a
+#usr/lib/libabsl_flags.a
+#usr/lib/libabsl_flags_commandlineflag.a
+#usr/lib/libabsl_flags_commandlineflag_internal.a
+#usr/lib/libabsl_flags_config.a
+#usr/lib/libabsl_flags_internal.a
+#usr/lib/libabsl_flags_marshalling.a
+#usr/lib/libabsl_flags_parse.a
+#usr/lib/libabsl_flags_private_handle_accessor.a
+#usr/lib/libabsl_flags_program_name.a
+#usr/lib/libabsl_flags_reflection.a
+#usr/lib/libabsl_flags_usage.a
+#usr/lib/libabsl_flags_usage_internal.a
+#usr/lib/libabsl_graphcycles_internal.a
+#usr/lib/libabsl_hash.a
+#usr/lib/libabsl_hashtablez_sampler.a
+#usr/lib/libabsl_int128.a
+#usr/lib/libabsl_kernel_timeout_internal.a
+#usr/lib/libabsl_leak_check.a
+#usr/lib/libabsl_log_entry.a
+#usr/lib/libabsl_log_flags.a
+#usr/lib/libabsl_log_globals.a
+#usr/lib/libabsl_log_initialize.a
+#usr/lib/libabsl_log_internal_check_op.a
+#usr/lib/libabsl_log_internal_conditions.a
+#usr/lib/libabsl_log_internal_format.a
+#usr/lib/libabsl_log_internal_globals.a
+#usr/lib/libabsl_log_internal_log_sink_set.a
+#usr/lib/libabsl_log_internal_message.a
+#usr/lib/libabsl_log_internal_nullguard.a
+#usr/lib/libabsl_log_internal_proto.a
+#usr/lib/libabsl_log_severity.a
+#usr/lib/libabsl_log_sink.a
+#usr/lib/libabsl_low_level_hash.a
+#usr/lib/libabsl_malloc_internal.a
+#usr/lib/libabsl_periodic_sampler.a
+#usr/lib/libabsl_random_distributions.a
+#usr/lib/libabsl_random_internal_distribution_test_util.a
+#usr/lib/libabsl_random_internal_platform.a
+#usr/lib/libabsl_random_internal_pool_urbg.a
+#usr/lib/libabsl_random_internal_randen.a
+#usr/lib/libabsl_random_internal_randen_hwaes.a
+#usr/lib/libabsl_random_internal_randen_hwaes_impl.a
+#usr/lib/libabsl_random_internal_randen_slow.a
+#usr/lib/libabsl_random_internal_seed_material.a
+#usr/lib/libabsl_random_seed_gen_exception.a
+#usr/lib/libabsl_random_seed_sequences.a
+#usr/lib/libabsl_raw_hash_set.a
+#usr/lib/libabsl_raw_logging_internal.a
+#usr/lib/libabsl_scoped_set_env.a
+#usr/lib/libabsl_spinlock_wait.a
+#usr/lib/libabsl_stacktrace.a
+#usr/lib/libabsl_status.a
+#usr/lib/libabsl_statusor.a
+#usr/lib/libabsl_str_format_internal.a
+#usr/lib/libabsl_strerror.a
+#usr/lib/libabsl_string_view.a
+#usr/lib/libabsl_strings.a
+#usr/lib/libabsl_strings_internal.a
+#usr/lib/libabsl_symbolize.a
+#usr/lib/libabsl_synchronization.a
+#usr/lib/libabsl_throw_delegate.a
+#usr/lib/libabsl_time.a
+#usr/lib/libabsl_time_zone.a
+#usr/lib/pkgconfig/absl_absl_check.pc
+#usr/lib/pkgconfig/absl_absl_log.pc
+#usr/lib/pkgconfig/absl_algorithm.pc
+#usr/lib/pkgconfig/absl_algorithm_container.pc
+#usr/lib/pkgconfig/absl_any.pc
+#usr/lib/pkgconfig/absl_any_invocable.pc
+#usr/lib/pkgconfig/absl_atomic_hook.pc
+#usr/lib/pkgconfig/absl_bad_any_cast.pc
+#usr/lib/pkgconfig/absl_bad_any_cast_impl.pc
+#usr/lib/pkgconfig/absl_bad_optional_access.pc
+#usr/lib/pkgconfig/absl_bad_variant_access.pc
+#usr/lib/pkgconfig/absl_base.pc
+#usr/lib/pkgconfig/absl_base_internal.pc
+#usr/lib/pkgconfig/absl_bind_front.pc
+#usr/lib/pkgconfig/absl_bits.pc
+#usr/lib/pkgconfig/absl_btree.pc
+#usr/lib/pkgconfig/absl_check.pc
+#usr/lib/pkgconfig/absl_city.pc
+#usr/lib/pkgconfig/absl_civil_time.pc
+#usr/lib/pkgconfig/absl_cleanup.pc
+#usr/lib/pkgconfig/absl_cleanup_internal.pc
+#usr/lib/pkgconfig/absl_common_policy_traits.pc
+#usr/lib/pkgconfig/absl_compare.pc
+#usr/lib/pkgconfig/absl_compressed_tuple.pc
+#usr/lib/pkgconfig/absl_config.pc
+#usr/lib/pkgconfig/absl_container_common.pc
+#usr/lib/pkgconfig/absl_container_memory.pc
+#usr/lib/pkgconfig/absl_cord.pc
+#usr/lib/pkgconfig/absl_cord_internal.pc
+#usr/lib/pkgconfig/absl_cordz_functions.pc
+#usr/lib/pkgconfig/absl_cordz_handle.pc
+#usr/lib/pkgconfig/absl_cordz_info.pc
+#usr/lib/pkgconfig/absl_cordz_sample_token.pc
+#usr/lib/pkgconfig/absl_cordz_statistics.pc
+#usr/lib/pkgconfig/absl_cordz_update_scope.pc
+#usr/lib/pkgconfig/absl_cordz_update_tracker.pc
+#usr/lib/pkgconfig/absl_core_headers.pc
+#usr/lib/pkgconfig/absl_counting_allocator.pc
+#usr/lib/pkgconfig/absl_crc32c.pc
+#usr/lib/pkgconfig/absl_crc_cord_state.pc
+#usr/lib/pkgconfig/absl_crc_cpu_detect.pc
+#usr/lib/pkgconfig/absl_crc_internal.pc
+#usr/lib/pkgconfig/absl_debugging.pc
+#usr/lib/pkgconfig/absl_debugging_internal.pc
+#usr/lib/pkgconfig/absl_demangle_internal.pc
+#usr/lib/pkgconfig/absl_die_if_null.pc
+#usr/lib/pkgconfig/absl_dynamic_annotations.pc
+#usr/lib/pkgconfig/absl_endian.pc
+#usr/lib/pkgconfig/absl_errno_saver.pc
+#usr/lib/pkgconfig/absl_examine_stack.pc
+#usr/lib/pkgconfig/absl_exponential_biased.pc
+#usr/lib/pkgconfig/absl_failure_signal_handler.pc
+#usr/lib/pkgconfig/absl_fast_type_id.pc
+#usr/lib/pkgconfig/absl_fixed_array.pc
+#usr/lib/pkgconfig/absl_flags.pc
+#usr/lib/pkgconfig/absl_flags_commandlineflag.pc
+#usr/lib/pkgconfig/absl_flags_commandlineflag_internal.pc
+#usr/lib/pkgconfig/absl_flags_config.pc
+#usr/lib/pkgconfig/absl_flags_internal.pc
+#usr/lib/pkgconfig/absl_flags_marshalling.pc
+#usr/lib/pkgconfig/absl_flags_parse.pc
+#usr/lib/pkgconfig/absl_flags_path_util.pc
+#usr/lib/pkgconfig/absl_flags_private_handle_accessor.pc
+#usr/lib/pkgconfig/absl_flags_program_name.pc
+#usr/lib/pkgconfig/absl_flags_reflection.pc
+#usr/lib/pkgconfig/absl_flags_usage.pc
+#usr/lib/pkgconfig/absl_flags_usage_internal.pc
+#usr/lib/pkgconfig/absl_flat_hash_map.pc
+#usr/lib/pkgconfig/absl_flat_hash_set.pc
+#usr/lib/pkgconfig/absl_function_ref.pc
+#usr/lib/pkgconfig/absl_graphcycles_internal.pc
+#usr/lib/pkgconfig/absl_hash.pc
+#usr/lib/pkgconfig/absl_hash_function_defaults.pc
+#usr/lib/pkgconfig/absl_hash_policy_traits.pc
+#usr/lib/pkgconfig/absl_hashtable_debug.pc
+#usr/lib/pkgconfig/absl_hashtable_debug_hooks.pc
+#usr/lib/pkgconfig/absl_hashtablez_sampler.pc
+#usr/lib/pkgconfig/absl_if_constexpr.pc
+#usr/lib/pkgconfig/absl_inlined_vector.pc
+#usr/lib/pkgconfig/absl_inlined_vector_internal.pc
+#usr/lib/pkgconfig/absl_int128.pc
+#usr/lib/pkgconfig/absl_kernel_timeout_internal.pc
+#usr/lib/pkgconfig/absl_layout.pc
+#usr/lib/pkgconfig/absl_leak_check.pc
+#usr/lib/pkgconfig/absl_log.pc
+#usr/lib/pkgconfig/absl_log_entry.pc
+#usr/lib/pkgconfig/absl_log_flags.pc
+#usr/lib/pkgconfig/absl_log_globals.pc
+#usr/lib/pkgconfig/absl_log_initialize.pc
+#usr/lib/pkgconfig/absl_log_internal_append_truncated.pc
+#usr/lib/pkgconfig/absl_log_internal_check_impl.pc
+#usr/lib/pkgconfig/absl_log_internal_check_op.pc
+#usr/lib/pkgconfig/absl_log_internal_conditions.pc
+#usr/lib/pkgconfig/absl_log_internal_config.pc
+#usr/lib/pkgconfig/absl_log_internal_flags.pc
+#usr/lib/pkgconfig/absl_log_internal_format.pc
+#usr/lib/pkgconfig/absl_log_internal_globals.pc
+#usr/lib/pkgconfig/absl_log_internal_log_impl.pc
+#usr/lib/pkgconfig/absl_log_internal_log_sink_set.pc
+#usr/lib/pkgconfig/absl_log_internal_message.pc
+#usr/lib/pkgconfig/absl_log_internal_nullguard.pc
+#usr/lib/pkgconfig/absl_log_internal_nullstream.pc
+#usr/lib/pkgconfig/absl_log_internal_proto.pc
+#usr/lib/pkgconfig/absl_log_internal_strip.pc
+#usr/lib/pkgconfig/absl_log_internal_structured.pc
+#usr/lib/pkgconfig/absl_log_internal_voidify.pc
+#usr/lib/pkgconfig/absl_log_severity.pc
+#usr/lib/pkgconfig/absl_log_sink.pc
+#usr/lib/pkgconfig/absl_log_sink_registry.pc
+#usr/lib/pkgconfig/absl_log_streamer.pc
+#usr/lib/pkgconfig/absl_log_structured.pc
+#usr/lib/pkgconfig/absl_low_level_hash.pc
+#usr/lib/pkgconfig/absl_malloc_internal.pc
+#usr/lib/pkgconfig/absl_memory.pc
+#usr/lib/pkgconfig/absl_meta.pc
+#usr/lib/pkgconfig/absl_node_hash_map.pc
+#usr/lib/pkgconfig/absl_node_hash_set.pc
+#usr/lib/pkgconfig/absl_node_slot_policy.pc
+#usr/lib/pkgconfig/absl_non_temporal_arm_intrinsics.pc
+#usr/lib/pkgconfig/absl_non_temporal_memcpy.pc
+#usr/lib/pkgconfig/absl_nullability.pc
+#usr/lib/pkgconfig/absl_numeric.pc
+#usr/lib/pkgconfig/absl_numeric_representation.pc
+#usr/lib/pkgconfig/absl_optional.pc
+#usr/lib/pkgconfig/absl_periodic_sampler.pc
+#usr/lib/pkgconfig/absl_prefetch.pc
+#usr/lib/pkgconfig/absl_pretty_function.pc
+#usr/lib/pkgconfig/absl_random_bit_gen_ref.pc
+#usr/lib/pkgconfig/absl_random_distributions.pc
+#usr/lib/pkgconfig/absl_random_internal_distribution_caller.pc
+#usr/lib/pkgconfig/absl_random_internal_distribution_test_util.pc
+#usr/lib/pkgconfig/absl_random_internal_fast_uniform_bits.pc
+#usr/lib/pkgconfig/absl_random_internal_fastmath.pc
+#usr/lib/pkgconfig/absl_random_internal_generate_real.pc
+#usr/lib/pkgconfig/absl_random_internal_iostream_state_saver.pc
+#usr/lib/pkgconfig/absl_random_internal_mock_helpers.pc
+#usr/lib/pkgconfig/absl_random_internal_nonsecure_base.pc
+#usr/lib/pkgconfig/absl_random_internal_pcg_engine.pc
+#usr/lib/pkgconfig/absl_random_internal_platform.pc
+#usr/lib/pkgconfig/absl_random_internal_pool_urbg.pc
+#usr/lib/pkgconfig/absl_random_internal_randen.pc
+#usr/lib/pkgconfig/absl_random_internal_randen_engine.pc
+#usr/lib/pkgconfig/absl_random_internal_randen_hwaes.pc
+#usr/lib/pkgconfig/absl_random_internal_randen_hwaes_impl.pc
+#usr/lib/pkgconfig/absl_random_internal_randen_slow.pc
+#usr/lib/pkgconfig/absl_random_internal_salted_seed_seq.pc
+#usr/lib/pkgconfig/absl_random_internal_seed_material.pc
+#usr/lib/pkgconfig/absl_random_internal_traits.pc
+#usr/lib/pkgconfig/absl_random_internal_uniform_helper.pc
+#usr/lib/pkgconfig/absl_random_internal_wide_multiply.pc
+#usr/lib/pkgconfig/absl_random_random.pc
+#usr/lib/pkgconfig/absl_random_seed_gen_exception.pc
+#usr/lib/pkgconfig/absl_random_seed_sequences.pc
+#usr/lib/pkgconfig/absl_raw_hash_map.pc
+#usr/lib/pkgconfig/absl_raw_hash_set.pc
+#usr/lib/pkgconfig/absl_raw_logging_internal.pc
+#usr/lib/pkgconfig/absl_sample_recorder.pc
+#usr/lib/pkgconfig/absl_scoped_set_env.pc
+#usr/lib/pkgconfig/absl_span.pc
+#usr/lib/pkgconfig/absl_spinlock_wait.pc
+#usr/lib/pkgconfig/absl_stacktrace.pc
+#usr/lib/pkgconfig/absl_status.pc
+#usr/lib/pkgconfig/absl_statusor.pc
+#usr/lib/pkgconfig/absl_str_format.pc
+#usr/lib/pkgconfig/absl_str_format_internal.pc
+#usr/lib/pkgconfig/absl_strerror.pc
+#usr/lib/pkgconfig/absl_string_view.pc
+#usr/lib/pkgconfig/absl_strings.pc
+#usr/lib/pkgconfig/absl_strings_internal.pc
+#usr/lib/pkgconfig/absl_symbolize.pc
+#usr/lib/pkgconfig/absl_synchronization.pc
+#usr/lib/pkgconfig/absl_throw_delegate.pc
+#usr/lib/pkgconfig/absl_time.pc
+#usr/lib/pkgconfig/absl_time_zone.pc
+#usr/lib/pkgconfig/absl_type_traits.pc
+#usr/lib/pkgconfig/absl_utility.pc
+#usr/lib/pkgconfig/absl_variant.pc
#usr/lib/libacl.la
usr/lib/libacl.so
usr/lib/libacl.so.1
-usr/lib/libacl.so.1.1.2301
+usr/lib/libacl.so.1.1.2302
#usr/lib/pkgconfig/libacl.pc
#usr/share/doc/acl
#usr/share/doc/acl/CHANGES
#usr/share/doc/acl/COPYING
#usr/share/doc/acl/COPYING.LGPL
-#usr/share/doc/acl/PORTING
#usr/share/doc/acl/extensions.txt
#usr/share/doc/acl/libacl.txt
#usr/share/locale/de/LC_MESSAGES/acl.mo
#usr/share/locale/es/LC_MESSAGES/acl.mo
#usr/share/locale/fr/LC_MESSAGES/acl.mo
#usr/share/locale/gl/LC_MESSAGES/acl.mo
+#usr/share/locale/ka/LC_MESSAGES/acl.mo
#usr/share/locale/pl/LC_MESSAGES/acl.mo
#usr/share/locale/sv/LC_MESSAGES/acl.mo
#usr/share/man/man1/chacl.1
usr/bin/attr
usr/bin/getfattr
usr/bin/setfattr
-#usr/etc
#usr/etc/xattr.conf
#usr/include/attr
#usr/include/attr/attributes.h
#usr/lib/libattr.la
#usr/lib/libattr.so
usr/lib/libattr.so.1
-usr/lib/libattr.so.1.1.2501
+usr/lib/libattr.so.1.1.2502
#usr/lib/pkgconfig/libattr.pc
#usr/share/doc/attr
#usr/share/doc/attr/CHANGES
#usr/share/doc/attr/COPYING
#usr/share/doc/attr/COPYING.LGPL
-#usr/share/doc/attr/PORTING
#usr/share/locale/cs/LC_MESSAGES/attr.mo
#usr/share/locale/de/LC_MESSAGES/attr.mo
#usr/share/locale/en@boldquot
#usr/share/locale/es/LC_MESSAGES/attr.mo
#usr/share/locale/fr/LC_MESSAGES/attr.mo
#usr/share/locale/gl/LC_MESSAGES/attr.mo
+#usr/share/locale/ka/LC_MESSAGES/attr.mo
#usr/share/locale/nl/LC_MESSAGES/attr.mo
#usr/share/locale/pl/LC_MESSAGES/attr.mo
#usr/share/locale/sv/LC_MESSAGES/attr.mo
#usr/include/pk11/site.h
#usr/include/pkcs11
#usr/include/pkcs11/pkcs11.h
-usr/lib/libbind9-9.16.45.so
+usr/lib/libbind9-9.16.48.so
#usr/lib/libbind9.la
#usr/lib/libbind9.so
-usr/lib/libdns-9.16.45.so
+usr/lib/libdns-9.16.48.so
#usr/lib/libdns.la
#usr/lib/libdns.so
-usr/lib/libirs-9.16.45.so
+usr/lib/libirs-9.16.48.so
#usr/lib/libirs.la
#usr/lib/libirs.so
-usr/lib/libisc-9.16.45.so
+usr/lib/libisc-9.16.48.so
#usr/lib/libisc.la
#usr/lib/libisc.so
-usr/lib/libisccc-9.16.45.so
+usr/lib/libisccc-9.16.48.so
#usr/lib/libisccc.la
#usr/lib/libisccc.so
-usr/lib/libisccfg-9.16.45.so
+usr/lib/libisccfg-9.16.48.so
#usr/lib/libisccfg.la
#usr/lib/libisccfg.so
-usr/lib/libns-9.16.45.so
+usr/lib/libns-9.16.48.so
#usr/lib/libns.la
#usr/lib/libns.so
#var/ipfire/menu.d/EX-apcupsd.menu
#var/ipfire/menu.d/EX-guardian.menu
#var/ipfire/menu.d/EX-mpfire.menu
+#var/ipfire/menu.d/EX-mympd.menu
#var/ipfire/menu.d/EX-samba.menu
#var/ipfire/menu.d/EX-tor.menu
+#var/ipfire/menu.d/EX-transmission.menu
+#var/ipfire/menu.d/EX-vdr.menu
#var/ipfire/menu.d/EX-wio.menu
#var/ipfire/menu.d/EX-wlanap.menu
var/ipfire/modem
-usr/bin/eu-addr2line
-usr/bin/eu-ar
-usr/bin/eu-elfclassify
-usr/bin/eu-elfcmp
-usr/bin/eu-elfcompress
-usr/bin/eu-elflint
-usr/bin/eu-findtextrel
-usr/bin/eu-make-debug-archive
-usr/bin/eu-nm
-usr/bin/eu-objdump
-usr/bin/eu-ranlib
-usr/bin/eu-readelf
-usr/bin/eu-size
-usr/bin/eu-srcfiles
-usr/bin/eu-stack
-usr/bin/eu-strings
-usr/bin/eu-strip
-usr/bin/eu-unstrip
+#usr/bin/eu-addr2line
+#usr/bin/eu-ar
+#usr/bin/eu-elfclassify
+#usr/bin/eu-elfcmp
+#usr/bin/eu-elfcompress
+#usr/bin/eu-elflint
+#usr/bin/eu-findtextrel
+#usr/bin/eu-make-debug-archive
+#usr/bin/eu-nm
+#usr/bin/eu-objdump
+#usr/bin/eu-ranlib
+#usr/bin/eu-readelf
+#usr/bin/eu-size
+#usr/bin/eu-srcfiles
+#usr/bin/eu-stack
+#usr/bin/eu-strings
+#usr/bin/eu-strip
+#usr/bin/eu-unstrip
#usr/include/dwarf.h
#usr/include/elfutils
#usr/include/elfutils/elf-knowledge.h
#usr/include/expat_config.h
#usr/include/expat_external.h
#usr/lib/cmake
-#usr/lib/cmake/expat-2.5.0
-#usr/lib/cmake/expat-2.5.0/expat-config-version.cmake
-#usr/lib/cmake/expat-2.5.0/expat-config.cmake
-#usr/lib/cmake/expat-2.5.0/expat-noconfig.cmake
-#usr/lib/cmake/expat-2.5.0/expat.cmake
+#usr/lib/cmake/expat-2.6.0
+#usr/lib/cmake/expat-2.6.0/expat-config-version.cmake
+#usr/lib/cmake/expat-2.6.0/expat-config.cmake
+#usr/lib/cmake/expat-2.6.0/expat-noconfig.cmake
+#usr/lib/cmake/expat-2.6.0/expat.cmake
#usr/lib/libexpat.la
#usr/lib/libexpat.so
usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.8.10
+usr/lib/libexpat.so.1.9.0
#usr/lib/pkgconfig/expat.pc
#usr/share/doc/expat
-#usr/share/doc/expat-2.5.0
-#usr/share/doc/expat-2.5.0/ok.min.css
-#usr/share/doc/expat-2.5.0/reference.html
-#usr/share/doc/expat-2.5.0/style.css
+#usr/share/doc/expat-2.6.0
+#usr/share/doc/expat-2.6.0/ok.min.css
+#usr/share/doc/expat-2.6.0/reference.html
+#usr/share/doc/expat-2.6.0/style.css
#usr/share/doc/expat/AUTHORS
#usr/share/doc/expat/changelog
+#usr/share/man/man1/xmlwf.1
#usr/lib/libasprintf.so
usr/lib/libasprintf.so.0
usr/lib/libasprintf.so.0.0.0
-usr/lib/libgettextlib-0.22.so
+usr/lib/libgettextlib-0.22.4.so
+usr/lib/libgettextlib.a
#usr/lib/libgettextlib.la
#usr/lib/libgettextlib.so
#usr/lib/libgettextpo.a
#usr/lib/libgettextpo.la
#usr/lib/libgettextpo.so
usr/lib/libgettextpo.so.0
-usr/lib/libgettextpo.so.0.5.9
-usr/lib/libgettextsrc-0.22.so
+usr/lib/libgettextpo.so.0.5.10
+usr/lib/libgettextsrc-0.22.4.so
+#usr/lib/libgettextsrc.a
#usr/lib/libgettextsrc.la
usr/lib/libgettextsrc.so
#usr/lib/libtextstyle.a
#usr/lib/libtextstyle.la
#usr/lib/libtextstyle.so
usr/lib/libtextstyle.so.0
-usr/lib/libtextstyle.so.0.2.0
+usr/lib/libtextstyle.so.0.2.1
usr/lib/preloadable_libintl.so
#usr/share/aclocal/build-to-host.m4
#usr/share/aclocal/gettext.m4
#usr/share/doc/libtextstyle/libtextstyle_abt.html
#usr/share/doc/libtextstyle/libtextstyle_toc.html
#usr/share/gettext
-#usr/share/gettext-0.22
-#usr/share/gettext-0.22/its
-#usr/share/gettext-0.22/its/glade.loc
-#usr/share/gettext-0.22/its/glade1.its
-#usr/share/gettext-0.22/its/glade2.its
-#usr/share/gettext-0.22/its/gsettings.its
-#usr/share/gettext-0.22/its/gsettings.loc
-#usr/share/gettext-0.22/its/gtkbuilder.its
-#usr/share/gettext-0.22/its/metainfo.its
-#usr/share/gettext-0.22/its/metainfo.loc
+#usr/share/gettext-0.22.4
+#usr/share/gettext-0.22.4/its
+#usr/share/gettext-0.22.4/its/glade.loc
+#usr/share/gettext-0.22.4/its/glade1.its
+#usr/share/gettext-0.22.4/its/glade2.its
+#usr/share/gettext-0.22.4/its/gsettings.its
+#usr/share/gettext-0.22.4/its/gsettings.loc
+#usr/share/gettext-0.22.4/its/gtkbuilder.its
+#usr/share/gettext-0.22.4/its/metainfo.its
+#usr/share/gettext-0.22.4/its/metainfo.loc
#usr/share/gettext/ABOUT-NLS
#usr/share/gettext/archive.dir.tar.xz
#usr/share/gettext/config.rpath
#usr/lib/libgnutls.la
#usr/lib/libgnutls.so
usr/lib/libgnutls.so.30
-usr/lib/libgnutls.so.30.37.0
+usr/lib/libgnutls.so.30.37.1
#usr/lib/libgnutlsxx.la
#usr/lib/libgnutlsxx.so
usr/lib/libgnutlsxx.so.30
#usr/lib/libidn.la
#usr/lib/libidn.so
usr/lib/libidn.so.12
-usr/lib/libidn.so.12.6.4
+usr/lib/libidn.so.12.6.5
#usr/lib/pkgconfig/libidn.pc
-#usr/share/emacs
-#usr/share/emacs/site-lisp
#usr/share/emacs/site-lisp/idna.el
#usr/share/emacs/site-lisp/punycode.el
#usr/lib/libpng16.la
usr/lib/libpng16.so
usr/lib/libpng16.so.16
-usr/lib/libpng16.so.16.39.0
+usr/lib/libpng16.so.16.41.0
#usr/lib/pkgconfig/libpng.pc
#usr/lib/pkgconfig/libpng16.pc
#usr/share/man/man3/libpng.3
#usr/include/libyang/config.h
#usr/include/libyang/context.h
#usr/include/libyang/dict.h
+#usr/include/libyang/hash_table.h
#usr/include/libyang/in.h
#usr/include/libyang/libyang.h
#usr/include/libyang/log.h
#usr/include/libyang/version.h
#usr/lib/libyang.so
usr/lib/libyang.so.2
-usr/lib/libyang.so.2.25.4
+usr/lib/libyang.so.2.46.3
#usr/lib/pkgconfig/libyang.pc
#usr/share/man/man1/yanglint.1
#usr/share/man/man1/yangre.1
#usr/share/doc/openssl/html/man3/CMS_get1_ReceiptRequest.html
#usr/share/doc/openssl/html/man3/CMS_sign.html
#usr/share/doc/openssl/html/man3/CMS_sign_receipt.html
+#usr/share/doc/openssl/html/man3/CMS_signed_get_attr.html
#usr/share/doc/openssl/html/man3/CMS_uncompress.html
#usr/share/doc/openssl/html/man3/CMS_verify.html
#usr/share/doc/openssl/html/man3/CMS_verify_receipt.html
#usr/share/doc/openssl/html/man3/EVP_PKEY_encapsulate.html
#usr/share/doc/openssl/html/man3/EVP_PKEY_encrypt.html
#usr/share/doc/openssl/html/man3/EVP_PKEY_fromdata.html
+#usr/share/doc/openssl/html/man3/EVP_PKEY_get_attr.html
#usr/share/doc/openssl/html/man3/EVP_PKEY_get_default_digest_nid.html
#usr/share/doc/openssl/html/man3/EVP_PKEY_get_field_type.html
#usr/share/doc/openssl/html/man3/EVP_PKEY_get_group_name.html
#usr/share/doc/openssl/html/man3/X509V3_get_d2i.html
#usr/share/doc/openssl/html/man3/X509V3_set_ctx.html
#usr/share/doc/openssl/html/man3/X509_ALGOR_dup.html
+#usr/share/doc/openssl/html/man3/X509_ATTRIBUTE.html
#usr/share/doc/openssl/html/man3/X509_CRL_get0_by_serial.html
#usr/share/doc/openssl/html/man3/X509_EXTENSION_set_object.html
#usr/share/doc/openssl/html/man3/X509_LOOKUP.html
#usr/share/doc/openssl/html/man3/X509_NAME_get_index_by_NID.html
#usr/share/doc/openssl/html/man3/X509_NAME_print_ex.html
#usr/share/doc/openssl/html/man3/X509_PUBKEY_new.html
+#usr/share/doc/openssl/html/man3/X509_REQ_get_attr.html
#usr/share/doc/openssl/html/man3/X509_REQ_get_extensions.html
#usr/share/doc/openssl/html/man3/X509_SIG_get0.html
#usr/share/doc/openssl/html/man3/X509_STORE_CTX_get_by_subject.html
#usr/share/man/man3/CMS_sign.3ossl
#usr/share/man/man3/CMS_sign_ex.3ossl
#usr/share/man/man3/CMS_sign_receipt.3ossl
+#usr/share/man/man3/CMS_signed_add1_attr.3ossl
+#usr/share/man/man3/CMS_signed_add1_attr_by_NID.3ossl
+#usr/share/man/man3/CMS_signed_add1_attr_by_OBJ.3ossl
+#usr/share/man/man3/CMS_signed_add1_attr_by_txt.3ossl
+#usr/share/man/man3/CMS_signed_delete_attr.3ossl
+#usr/share/man/man3/CMS_signed_get0_data_by_OBJ.3ossl
+#usr/share/man/man3/CMS_signed_get_attr.3ossl
+#usr/share/man/man3/CMS_signed_get_attr_by_NID.3ossl
+#usr/share/man/man3/CMS_signed_get_attr_by_OBJ.3ossl
+#usr/share/man/man3/CMS_signed_get_attr_count.3ossl
#usr/share/man/man3/CMS_uncompress.3ossl
+#usr/share/man/man3/CMS_unsigned_add1_attr.3ossl
+#usr/share/man/man3/CMS_unsigned_add1_attr_by_NID.3ossl
+#usr/share/man/man3/CMS_unsigned_add1_attr_by_OBJ.3ossl
+#usr/share/man/man3/CMS_unsigned_add1_attr_by_txt.3ossl
+#usr/share/man/man3/CMS_unsigned_delete_attr.3ossl
+#usr/share/man/man3/CMS_unsigned_get0_data_by_OBJ.3ossl
+#usr/share/man/man3/CMS_unsigned_get_attr.3ossl
+#usr/share/man/man3/CMS_unsigned_get_attr_by_NID.3ossl
+#usr/share/man/man3/CMS_unsigned_get_attr_by_OBJ.3ossl
+#usr/share/man/man3/CMS_unsigned_get_attr_count.3ossl
#usr/share/man/man3/CMS_verify.3ossl
#usr/share/man/man3/CMS_verify_receipt.3ossl
#usr/share/man/man3/COMP_CTX_free.3ossl
#usr/share/man/man3/EVP_PKEY_CTX_settable_params.3ossl
#usr/share/man/man3/EVP_PKEY_METHOD.3ossl
#usr/share/man/man3/EVP_PKEY_Q_keygen.3ossl
+#usr/share/man/man3/EVP_PKEY_add1_attr.3ossl
+#usr/share/man/man3/EVP_PKEY_add1_attr_by_NID.3ossl
+#usr/share/man/man3/EVP_PKEY_add1_attr_by_OBJ.3ossl
+#usr/share/man/man3/EVP_PKEY_add1_attr_by_txt.3ossl
#usr/share/man/man3/EVP_PKEY_asn1_add0.3ossl
#usr/share/man/man3/EVP_PKEY_asn1_add_alias.3ossl
#usr/share/man/man3/EVP_PKEY_asn1_copy.3ossl
#usr/share/man/man3/EVP_PKEY_decrypt.3ossl
#usr/share/man/man3/EVP_PKEY_decrypt_init.3ossl
#usr/share/man/man3/EVP_PKEY_decrypt_init_ex.3ossl
+#usr/share/man/man3/EVP_PKEY_delete_attr.3ossl
#usr/share/man/man3/EVP_PKEY_derive.3ossl
#usr/share/man/man3/EVP_PKEY_derive_init.3ossl
#usr/share/man/man3/EVP_PKEY_derive_init_ex.3ossl
#usr/share/man/man3/EVP_PKEY_get1_RSA.3ossl
#usr/share/man/man3/EVP_PKEY_get1_encoded_public_key.3ossl
#usr/share/man/man3/EVP_PKEY_get1_tls_encodedpoint.3ossl
+#usr/share/man/man3/EVP_PKEY_get_attr.3ossl
+#usr/share/man/man3/EVP_PKEY_get_attr_by_NID.3ossl
+#usr/share/man/man3/EVP_PKEY_get_attr_by_OBJ.3ossl
+#usr/share/man/man3/EVP_PKEY_get_attr_count.3ossl
#usr/share/man/man3/EVP_PKEY_get_base_id.3ossl
#usr/share/man/man3/EVP_PKEY_get_bits.3ossl
#usr/share/man/man3/EVP_PKEY_get_bn_param.3ossl
#usr/share/man/man3/OPENSSL_LH_error.3ossl
#usr/share/man/man3/OPENSSL_LH_flush.3ossl
#usr/share/man/man3/OPENSSL_LH_free.3ossl
+#usr/share/man/man3/OPENSSL_LH_get_down_load.3ossl
#usr/share/man/man3/OPENSSL_LH_insert.3ossl
#usr/share/man/man3/OPENSSL_LH_new.3ossl
#usr/share/man/man3/OPENSSL_LH_node_stats.3ossl
#usr/share/man/man3/OPENSSL_LH_node_stats_bio.3ossl
#usr/share/man/man3/OPENSSL_LH_node_usage_stats.3ossl
#usr/share/man/man3/OPENSSL_LH_node_usage_stats_bio.3ossl
+#usr/share/man/man3/OPENSSL_LH_num_items.3ossl
#usr/share/man/man3/OPENSSL_LH_retrieve.3ossl
+#usr/share/man/man3/OPENSSL_LH_set_down_load.3ossl
#usr/share/man/man3/OPENSSL_LH_stats.3ossl
#usr/share/man/man3/OPENSSL_LH_stats_bio.3ossl
#usr/share/man/man3/OPENSSL_LINE.3ossl
#usr/share/man/man3/X509_ALGOR_new.3ossl
#usr/share/man/man3/X509_ALGOR_set0.3ossl
#usr/share/man/man3/X509_ALGOR_set_md.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_count.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_create.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_create_by_NID.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_create_by_OBJ.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_create_by_txt.3ossl
#usr/share/man/man3/X509_ATTRIBUTE_dup.3ossl
#usr/share/man/man3/X509_ATTRIBUTE_free.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_get0_data.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_get0_object.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_get0_type.3ossl
#usr/share/man/man3/X509_ATTRIBUTE_new.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_set1_data.3ossl
+#usr/share/man/man3/X509_ATTRIBUTE_set1_object.3ossl
#usr/share/man/man3/X509_CERT_AUX_free.3ossl
#usr/share/man/man3/X509_CERT_AUX_new.3ossl
#usr/share/man/man3/X509_CINF_free.3ossl
#usr/share/man/man3/X509_PUBKEY_set0_public_key.3ossl
#usr/share/man/man3/X509_REQ_INFO_free.3ossl
#usr/share/man/man3/X509_REQ_INFO_new.3ossl
+#usr/share/man/man3/X509_REQ_add1_attr.3ossl
+#usr/share/man/man3/X509_REQ_add1_attr_by_NID.3ossl
+#usr/share/man/man3/X509_REQ_add1_attr_by_OBJ.3ossl
+#usr/share/man/man3/X509_REQ_add1_attr_by_txt.3ossl
#usr/share/man/man3/X509_REQ_add_extensions.3ossl
#usr/share/man/man3/X509_REQ_add_extensions_nid.3ossl
#usr/share/man/man3/X509_REQ_check_private_key.3ossl
+#usr/share/man/man3/X509_REQ_delete_attr.3ossl
#usr/share/man/man3/X509_REQ_digest.3ossl
#usr/share/man/man3/X509_REQ_dup.3ossl
#usr/share/man/man3/X509_REQ_free.3ossl
#usr/share/man/man3/X509_REQ_get0_pubkey.3ossl
#usr/share/man/man3/X509_REQ_get0_signature.3ossl
#usr/share/man/man3/X509_REQ_get_X509_PUBKEY.3ossl
+#usr/share/man/man3/X509_REQ_get_attr.3ossl
+#usr/share/man/man3/X509_REQ_get_attr_by_NID.3ossl
+#usr/share/man/man3/X509_REQ_get_attr_by_OBJ.3ossl
+#usr/share/man/man3/X509_REQ_get_attr_count.3ossl
#usr/share/man/man3/X509_REQ_get_extensions.3ossl
#usr/share/man/man3/X509_REQ_get_pubkey.3ossl
#usr/share/man/man3/X509_REQ_get_signature_nid.3ossl
#usr/share/man/man3/X509_verify.3ossl
#usr/share/man/man3/X509_verify_cert.3ossl
#usr/share/man/man3/X509_verify_cert_error_string.3ossl
+#usr/share/man/man3/X509at_add1_attr.3ossl
+#usr/share/man/man3/X509at_add1_attr_by_NID.3ossl
+#usr/share/man/man3/X509at_add1_attr_by_OBJ.3ossl
+#usr/share/man/man3/X509at_add1_attr_by_txt.3ossl
+#usr/share/man/man3/X509at_delete_attr.3ossl
+#usr/share/man/man3/X509at_get0_data_by_OBJ.3ossl
+#usr/share/man/man3/X509at_get_attr.3ossl
+#usr/share/man/man3/X509at_get_attr_by_NID.3ossl
+#usr/share/man/man3/X509at_get_attr_by_OBJ.3ossl
+#usr/share/man/man3/X509at_get_attr_count.3ossl
#usr/share/man/man3/X509v3_add_ext.3ossl
#usr/share/man/man3/X509v3_delete_ext.3ossl
#usr/share/man/man3/X509v3_get_ext.3ossl
#usr/share/man/man3/lh_TYPE_error.3ossl
#usr/share/man/man3/lh_TYPE_flush.3ossl
#usr/share/man/man3/lh_TYPE_free.3ossl
+#usr/share/man/man3/lh_TYPE_get_down_load.3ossl
#usr/share/man/man3/lh_TYPE_insert.3ossl
#usr/share/man/man3/lh_TYPE_new.3ossl
+#usr/share/man/man3/lh_TYPE_num_items.3ossl
#usr/share/man/man3/lh_TYPE_retrieve.3ossl
+#usr/share/man/man3/lh_TYPE_set_down_load.3ossl
#usr/share/man/man3/o2i_SCT.3ossl
#usr/share/man/man3/o2i_SCT_LIST.3ossl
#usr/share/man/man3/pem_password_cb.3ossl
#lib/security/mkhomedir_helper
#lib/security/pam_access.la
lib/security/pam_access.so
+#lib/security/pam_canonicalize_user.la
+#lib/security/pam_canonicalize_user.so
#lib/security/pam_debug.la
#lib/security/pam_debug.so
#lib/security/pam_deny.la
#usr/share/man/man8/mkhomedir_helper.8
#usr/share/man/man8/pam.8
#usr/share/man/man8/pam_access.8
+#usr/share/man/man8/pam_canonicalize_user.8
#usr/share/man/man8/pam_debug.8
#usr/share/man/man8/pam_deny.8
#usr/share/man/man8/pam_echo.8
#usr/include/pixman-1
#usr/include/pixman-1/pixman-version.h
#usr/include/pixman-1/pixman.h
-#usr/lib/libpixman-1.la
#usr/lib/libpixman-1.so
usr/lib/libpixman-1.so.0
-usr/lib/libpixman-1.so.0.42.2
+usr/lib/libpixman-1.so.0.43.0
#usr/lib/pkgconfig/pixman-1.pc
usr/lib/libpoppler-glib.so.8
usr/lib/libpoppler-glib.so.8.26.0
#usr/lib/libpoppler.so
-usr/lib/libpoppler.so.130
-usr/lib/libpoppler.so.130.0.0
+usr/lib/libpoppler.so.133
+usr/lib/libpoppler.so.133.0.0
#usr/lib/pkgconfig/poppler-cpp.pc
#usr/lib/pkgconfig/poppler-glib.pc
#usr/lib/pkgconfig/poppler.pc
--- /dev/null
+#usr/bin/protoc
+#usr/bin/protoc-25.2.0
+#usr/include/google
+#usr/include/google/protobuf
+#usr/include/google/protobuf/any.h
+#usr/include/google/protobuf/any.pb.h
+#usr/include/google/protobuf/any.proto
+#usr/include/google/protobuf/api.pb.h
+#usr/include/google/protobuf/api.proto
+#usr/include/google/protobuf/arena.h
+#usr/include/google/protobuf/arena_align.h
+#usr/include/google/protobuf/arena_allocation_policy.h
+#usr/include/google/protobuf/arena_cleanup.h
+#usr/include/google/protobuf/arenastring.h
+#usr/include/google/protobuf/arenaz_sampler.h
+#usr/include/google/protobuf/compiler
+#usr/include/google/protobuf/compiler/allowlists
+#usr/include/google/protobuf/compiler/allowlists/allowlist.h
+#usr/include/google/protobuf/compiler/allowlists/allowlists.h
+#usr/include/google/protobuf/compiler/code_generator.h
+#usr/include/google/protobuf/compiler/command_line_interface.h
+#usr/include/google/protobuf/compiler/cpp
+#usr/include/google/protobuf/compiler/cpp/enum.h
+#usr/include/google/protobuf/compiler/cpp/extension.h
+#usr/include/google/protobuf/compiler/cpp/field.h
+#usr/include/google/protobuf/compiler/cpp/field_generators
+#usr/include/google/protobuf/compiler/cpp/field_generators/generators.h
+#usr/include/google/protobuf/compiler/cpp/file.h
+#usr/include/google/protobuf/compiler/cpp/generator.h
+#usr/include/google/protobuf/compiler/cpp/helpers.h
+#usr/include/google/protobuf/compiler/cpp/message.h
+#usr/include/google/protobuf/compiler/cpp/message_layout_helper.h
+#usr/include/google/protobuf/compiler/cpp/names.h
+#usr/include/google/protobuf/compiler/cpp/options.h
+#usr/include/google/protobuf/compiler/cpp/padding_optimizer.h
+#usr/include/google/protobuf/compiler/cpp/parse_function_generator.h
+#usr/include/google/protobuf/compiler/cpp/service.h
+#usr/include/google/protobuf/compiler/cpp/tracker.h
+#usr/include/google/protobuf/compiler/csharp
+#usr/include/google/protobuf/compiler/csharp/csharp_doc_comment.h
+#usr/include/google/protobuf/compiler/csharp/csharp_enum.h
+#usr/include/google/protobuf/compiler/csharp/csharp_enum_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_field_base.h
+#usr/include/google/protobuf/compiler/csharp/csharp_generator.h
+#usr/include/google/protobuf/compiler/csharp/csharp_helpers.h
+#usr/include/google/protobuf/compiler/csharp/csharp_map_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_message.h
+#usr/include/google/protobuf/compiler/csharp/csharp_message_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_options.h
+#usr/include/google/protobuf/compiler/csharp/csharp_primitive_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_reflection_class.h
+#usr/include/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
+#usr/include/google/protobuf/compiler/csharp/csharp_source_generator_base.h
+#usr/include/google/protobuf/compiler/csharp/csharp_wrapper_field.h
+#usr/include/google/protobuf/compiler/csharp/names.h
+#usr/include/google/protobuf/compiler/importer.h
+#usr/include/google/protobuf/compiler/java
+#usr/include/google/protobuf/compiler/java/context.h
+#usr/include/google/protobuf/compiler/java/doc_comment.h
+#usr/include/google/protobuf/compiler/java/enum.h
+#usr/include/google/protobuf/compiler/java/enum_field.h
+#usr/include/google/protobuf/compiler/java/enum_field_lite.h
+#usr/include/google/protobuf/compiler/java/enum_lite.h
+#usr/include/google/protobuf/compiler/java/extension.h
+#usr/include/google/protobuf/compiler/java/extension_lite.h
+#usr/include/google/protobuf/compiler/java/field.h
+#usr/include/google/protobuf/compiler/java/file.h
+#usr/include/google/protobuf/compiler/java/generator.h
+#usr/include/google/protobuf/compiler/java/generator_factory.h
+#usr/include/google/protobuf/compiler/java/helpers.h
+#usr/include/google/protobuf/compiler/java/java_features.pb.h
+#usr/include/google/protobuf/compiler/java/kotlin_generator.h
+#usr/include/google/protobuf/compiler/java/map_field.h
+#usr/include/google/protobuf/compiler/java/map_field_lite.h
+#usr/include/google/protobuf/compiler/java/message.h
+#usr/include/google/protobuf/compiler/java/message_builder.h
+#usr/include/google/protobuf/compiler/java/message_builder_lite.h
+#usr/include/google/protobuf/compiler/java/message_field.h
+#usr/include/google/protobuf/compiler/java/message_field_lite.h
+#usr/include/google/protobuf/compiler/java/message_lite.h
+#usr/include/google/protobuf/compiler/java/message_serialization.h
+#usr/include/google/protobuf/compiler/java/name_resolver.h
+#usr/include/google/protobuf/compiler/java/names.h
+#usr/include/google/protobuf/compiler/java/options.h
+#usr/include/google/protobuf/compiler/java/primitive_field.h
+#usr/include/google/protobuf/compiler/java/primitive_field_lite.h
+#usr/include/google/protobuf/compiler/java/service.h
+#usr/include/google/protobuf/compiler/java/shared_code_generator.h
+#usr/include/google/protobuf/compiler/java/string_field.h
+#usr/include/google/protobuf/compiler/java/string_field_lite.h
+#usr/include/google/protobuf/compiler/objectivec
+#usr/include/google/protobuf/compiler/objectivec/enum.h
+#usr/include/google/protobuf/compiler/objectivec/enum_field.h
+#usr/include/google/protobuf/compiler/objectivec/extension.h
+#usr/include/google/protobuf/compiler/objectivec/field.h
+#usr/include/google/protobuf/compiler/objectivec/file.h
+#usr/include/google/protobuf/compiler/objectivec/generator.h
+#usr/include/google/protobuf/compiler/objectivec/helpers.h
+#usr/include/google/protobuf/compiler/objectivec/import_writer.h
+#usr/include/google/protobuf/compiler/objectivec/line_consumer.h
+#usr/include/google/protobuf/compiler/objectivec/map_field.h
+#usr/include/google/protobuf/compiler/objectivec/message.h
+#usr/include/google/protobuf/compiler/objectivec/message_field.h
+#usr/include/google/protobuf/compiler/objectivec/names.h
+#usr/include/google/protobuf/compiler/objectivec/nsobject_methods.h
+#usr/include/google/protobuf/compiler/objectivec/oneof.h
+#usr/include/google/protobuf/compiler/objectivec/options.h
+#usr/include/google/protobuf/compiler/objectivec/primitive_field.h
+#usr/include/google/protobuf/compiler/objectivec/text_format_decode_data.h
+#usr/include/google/protobuf/compiler/parser.h
+#usr/include/google/protobuf/compiler/php
+#usr/include/google/protobuf/compiler/php/names.h
+#usr/include/google/protobuf/compiler/php/php_generator.h
+#usr/include/google/protobuf/compiler/plugin.h
+#usr/include/google/protobuf/compiler/plugin.pb.h
+#usr/include/google/protobuf/compiler/plugin.proto
+#usr/include/google/protobuf/compiler/python
+#usr/include/google/protobuf/compiler/python/generator.h
+#usr/include/google/protobuf/compiler/python/helpers.h
+#usr/include/google/protobuf/compiler/python/pyi_generator.h
+#usr/include/google/protobuf/compiler/retention.h
+#usr/include/google/protobuf/compiler/ruby
+#usr/include/google/protobuf/compiler/ruby/ruby_generator.h
+#usr/include/google/protobuf/compiler/rust
+#usr/include/google/protobuf/compiler/rust/accessors
+#usr/include/google/protobuf/compiler/rust/accessors/accessor_generator.h
+#usr/include/google/protobuf/compiler/rust/accessors/accessors.h
+#usr/include/google/protobuf/compiler/rust/context.h
+#usr/include/google/protobuf/compiler/rust/generator.h
+#usr/include/google/protobuf/compiler/rust/message.h
+#usr/include/google/protobuf/compiler/rust/naming.h
+#usr/include/google/protobuf/compiler/rust/oneof.h
+#usr/include/google/protobuf/compiler/rust/relative_path.h
+#usr/include/google/protobuf/compiler/scc.h
+#usr/include/google/protobuf/compiler/subprocess.h
+#usr/include/google/protobuf/compiler/versions.h
+#usr/include/google/protobuf/compiler/versions_suffix.h
+#usr/include/google/protobuf/compiler/zip_writer.h
+#usr/include/google/protobuf/cpp_edition_defaults.h
+#usr/include/google/protobuf/cpp_features.pb.h
+#usr/include/google/protobuf/cpp_features.proto
+#usr/include/google/protobuf/descriptor.h
+#usr/include/google/protobuf/descriptor.pb.h
+#usr/include/google/protobuf/descriptor.proto
+#usr/include/google/protobuf/descriptor_database.h
+#usr/include/google/protobuf/descriptor_legacy.h
+#usr/include/google/protobuf/descriptor_visitor.h
+#usr/include/google/protobuf/duration.pb.h
+#usr/include/google/protobuf/duration.proto
+#usr/include/google/protobuf/dynamic_message.h
+#usr/include/google/protobuf/empty.pb.h
+#usr/include/google/protobuf/empty.proto
+#usr/include/google/protobuf/endian.h
+#usr/include/google/protobuf/explicitly_constructed.h
+#usr/include/google/protobuf/extension_set.h
+#usr/include/google/protobuf/extension_set_inl.h
+#usr/include/google/protobuf/feature_resolver.h
+#usr/include/google/protobuf/field_access_listener.h
+#usr/include/google/protobuf/field_mask.pb.h
+#usr/include/google/protobuf/field_mask.proto
+#usr/include/google/protobuf/generated_enum_reflection.h
+#usr/include/google/protobuf/generated_enum_util.h
+#usr/include/google/protobuf/generated_message_bases.h
+#usr/include/google/protobuf/generated_message_reflection.h
+#usr/include/google/protobuf/generated_message_tctable_decl.h
+#usr/include/google/protobuf/generated_message_tctable_gen.h
+#usr/include/google/protobuf/generated_message_tctable_impl.h
+#usr/include/google/protobuf/generated_message_util.h
+#usr/include/google/protobuf/has_bits.h
+#usr/include/google/protobuf/implicit_weak_message.h
+#usr/include/google/protobuf/inlined_string_field.h
+#usr/include/google/protobuf/internal_message_util.h
+#usr/include/google/protobuf/internal_visibility.h
+#usr/include/google/protobuf/io
+#usr/include/google/protobuf/io/coded_stream.h
+#usr/include/google/protobuf/io/gzip_stream.h
+#usr/include/google/protobuf/io/io_win32.h
+#usr/include/google/protobuf/io/printer.h
+#usr/include/google/protobuf/io/strtod.h
+#usr/include/google/protobuf/io/tokenizer.h
+#usr/include/google/protobuf/io/zero_copy_sink.h
+#usr/include/google/protobuf/io/zero_copy_stream.h
+#usr/include/google/protobuf/io/zero_copy_stream_impl.h
+#usr/include/google/protobuf/io/zero_copy_stream_impl_lite.h
+#usr/include/google/protobuf/json
+#usr/include/google/protobuf/json/internal
+#usr/include/google/protobuf/json/internal/descriptor_traits.h
+#usr/include/google/protobuf/json/internal/lexer.h
+#usr/include/google/protobuf/json/internal/message_path.h
+#usr/include/google/protobuf/json/internal/parser.h
+#usr/include/google/protobuf/json/internal/parser_traits.h
+#usr/include/google/protobuf/json/internal/unparser.h
+#usr/include/google/protobuf/json/internal/unparser_traits.h
+#usr/include/google/protobuf/json/internal/untyped_message.h
+#usr/include/google/protobuf/json/internal/writer.h
+#usr/include/google/protobuf/json/internal/zero_copy_buffered_stream.h
+#usr/include/google/protobuf/json/json.h
+#usr/include/google/protobuf/map.h
+#usr/include/google/protobuf/map_entry.h
+#usr/include/google/protobuf/map_field.h
+#usr/include/google/protobuf/map_field_inl.h
+#usr/include/google/protobuf/map_field_lite.h
+#usr/include/google/protobuf/map_type_handler.h
+#usr/include/google/protobuf/message.h
+#usr/include/google/protobuf/message_lite.h
+#usr/include/google/protobuf/metadata.h
+#usr/include/google/protobuf/metadata_lite.h
+#usr/include/google/protobuf/parse_context.h
+#usr/include/google/protobuf/port.h
+#usr/include/google/protobuf/port_def.inc
+#usr/include/google/protobuf/port_undef.inc
+#usr/include/google/protobuf/raw_ptr.h
+#usr/include/google/protobuf/reflection.h
+#usr/include/google/protobuf/reflection_internal.h
+#usr/include/google/protobuf/reflection_mode.h
+#usr/include/google/protobuf/reflection_ops.h
+#usr/include/google/protobuf/repeated_field.h
+#usr/include/google/protobuf/repeated_ptr_field.h
+#usr/include/google/protobuf/serial_arena.h
+#usr/include/google/protobuf/service.h
+#usr/include/google/protobuf/source_context.pb.h
+#usr/include/google/protobuf/source_context.proto
+#usr/include/google/protobuf/string_block.h
+#usr/include/google/protobuf/struct.pb.h
+#usr/include/google/protobuf/struct.proto
+#usr/include/google/protobuf/stubs
+#usr/include/google/protobuf/stubs/callback.h
+#usr/include/google/protobuf/stubs/common.h
+#usr/include/google/protobuf/stubs/platform_macros.h
+#usr/include/google/protobuf/stubs/port.h
+#usr/include/google/protobuf/stubs/status_macros.h
+#usr/include/google/protobuf/text_format.h
+#usr/include/google/protobuf/thread_safe_arena.h
+#usr/include/google/protobuf/timestamp.pb.h
+#usr/include/google/protobuf/timestamp.proto
+#usr/include/google/protobuf/type.pb.h
+#usr/include/google/protobuf/type.proto
+#usr/include/google/protobuf/unknown_field_set.h
+#usr/include/google/protobuf/util
+#usr/include/google/protobuf/util/delimited_message_util.h
+#usr/include/google/protobuf/util/field_comparator.h
+#usr/include/google/protobuf/util/field_mask_util.h
+#usr/include/google/protobuf/util/json_util.h
+#usr/include/google/protobuf/util/message_differencer.h
+#usr/include/google/protobuf/util/time_util.h
+#usr/include/google/protobuf/util/type_resolver.h
+#usr/include/google/protobuf/util/type_resolver_util.h
+#usr/include/google/protobuf/varint_shuffle.h
+#usr/include/google/protobuf/wire_format.h
+#usr/include/google/protobuf/wire_format_lite.h
+#usr/include/google/protobuf/wrappers.pb.h
+#usr/include/google/protobuf/wrappers.proto
+#usr/include/java
+#usr/include/java/core
+#usr/include/java/core/src
+#usr/include/java/core/src/main
+#usr/include/java/core/src/main/java
+#usr/include/java/core/src/main/java/com
+#usr/include/java/core/src/main/java/com/google
+#usr/include/java/core/src/main/java/com/google/protobuf
+#usr/include/java/core/src/main/java/com/google/protobuf/java_features.proto
+#usr/include/utf8_range.h
+#usr/include/utf8_validity.h
+#usr/lib/cmake/protobuf
+#usr/lib/cmake/protobuf/protobuf-config-version.cmake
+#usr/lib/cmake/protobuf/protobuf-config.cmake
+#usr/lib/cmake/protobuf/protobuf-generate.cmake
+#usr/lib/cmake/protobuf/protobuf-module.cmake
+#usr/lib/cmake/protobuf/protobuf-options.cmake
+#usr/lib/cmake/protobuf/protobuf-targets-noconfig.cmake
+#usr/lib/cmake/protobuf/protobuf-targets.cmake
+#usr/lib/cmake/utf8_range
+#usr/lib/cmake/utf8_range/utf8_range-config.cmake
+#usr/lib/cmake/utf8_range/utf8_range-targets-noconfig.cmake
+#usr/lib/cmake/utf8_range/utf8_range-targets.cmake
+#usr/lib/libprotobuf-lite.so
+#usr/lib/libprotobuf-lite.so.25.2.0
+#usr/lib/libprotobuf.so
+#usr/lib/libprotobuf.so.25.2.0
+#usr/lib/libprotoc.so
+#usr/lib/libprotoc.so.25.2.0
+#usr/lib/libutf8_range.a
+#usr/lib/libutf8_validity.a
+#usr/lib/pkgconfig/protobuf-lite.pc
+#usr/lib/pkgconfig/protobuf.pc
+#usr/lib/pkgconfig/utf8_range.pc
--- /dev/null
+#usr/bin/protoc-c
+#usr/bin/protoc-gen-c
+#usr/include/google/protobuf-c
+#usr/include/google/protobuf-c/protobuf-c.h
+#usr/include/protobuf-c
+#usr/include/protobuf-c/protobuf-c.h
+#usr/include/protobuf-c/protobuf-c.proto
+#usr/lib/libprotobuf-c.a
+#usr/lib/libprotobuf-c.la
+#usr/lib/libprotobuf-c.so
+#usr/lib/libprotobuf-c.so.1
+#usr/lib/libprotobuf-c.so.1.0.0
+#usr/lib/pkgconfig/libprotobuf-c.pc
--- /dev/null
+#usr/lib/python3.10/site-packages/calver
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/entry_points.txt
+#usr/lib/python3.10/site-packages/calver-2022.6.26-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/calver/__init__.py
+#usr/lib/python3.10/site-packages/calver/integration.py
--- /dev/null
+#usr/lib/python3.10/site-packages/editables
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/LICENSE.txt
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/METADATA
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/RECORD
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/editables-0.5.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/editables/__init__.py
+#usr/lib/python3.10/site-packages/editables/py.typed
+#usr/lib/python3.10/site-packages/editables/redirector.py
--- /dev/null
+#usr/bin/hatch-fancy-pypi-readme
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/entry_points.txt
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/licenses
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/licenses/AUTHORS.md
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme-24.1.0.dist-info/licenses/LICENSE.txt
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/__init__.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/__main__.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_builder.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_cli.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_config.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_fragments.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/_substitutions.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/exceptions.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/hooks.py
+#usr/lib/python3.10/site-packages/hatch_fancy_pypi_readme/py.typed
--- /dev/null
+#usr/lib/python3.10/site-packages/hatch_vcs
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/entry_points.txt
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/licenses
+#usr/lib/python3.10/site-packages/hatch_vcs-0.4.0.dist-info/licenses/LICENSE.txt
+#usr/lib/python3.10/site-packages/hatch_vcs/__about__.py
+#usr/lib/python3.10/site-packages/hatch_vcs/__init__.py
+#usr/lib/python3.10/site-packages/hatch_vcs/build_hook.py
+#usr/lib/python3.10/site-packages/hatch_vcs/hooks.py
+#usr/lib/python3.10/site-packages/hatch_vcs/metadata_hook.py
+#usr/lib/python3.10/site-packages/hatch_vcs/vcs_utils.py
+#usr/lib/python3.10/site-packages/hatch_vcs/version_source.py
--- /dev/null
+#usr/bin/hatchling
+#usr/lib/python3.10/site-packages/hatchling
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/entry_points.txt
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/licenses
+#usr/lib/python3.10/site-packages/hatchling-1.21.1.dist-info/licenses/LICENSE.txt
+#usr/lib/python3.10/site-packages/hatchling/__about__.py
+#usr/lib/python3.10/site-packages/hatchling/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/__main__.py
+#usr/lib/python3.10/site-packages/hatchling/bridge
+#usr/lib/python3.10/site-packages/hatchling/bridge/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/bridge/app.py
+#usr/lib/python3.10/site-packages/hatchling/build.py
+#usr/lib/python3.10/site-packages/hatchling/builders
+#usr/lib/python3.10/site-packages/hatchling/builders/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/app.py
+#usr/lib/python3.10/site-packages/hatchling/builders/config.py
+#usr/lib/python3.10/site-packages/hatchling/builders/constants.py
+#usr/lib/python3.10/site-packages/hatchling/builders/custom.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/custom.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/builders/hooks/version.py
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/builders/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/builders/sdist.py
+#usr/lib/python3.10/site-packages/hatchling/builders/utils.py
+#usr/lib/python3.10/site-packages/hatchling/builders/wheel.py
+#usr/lib/python3.10/site-packages/hatchling/cli
+#usr/lib/python3.10/site-packages/hatchling/cli/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/build
+#usr/lib/python3.10/site-packages/hatchling/cli/build/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/dep
+#usr/lib/python3.10/site-packages/hatchling/cli/dep/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/metadata
+#usr/lib/python3.10/site-packages/hatchling/cli/metadata/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/cli/version
+#usr/lib/python3.10/site-packages/hatchling/cli/version/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/dep
+#usr/lib/python3.10/site-packages/hatchling/dep/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/dep/core.py
+#usr/lib/python3.10/site-packages/hatchling/licenses
+#usr/lib/python3.10/site-packages/hatchling/licenses/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/licenses/parse.py
+#usr/lib/python3.10/site-packages/hatchling/licenses/supported.py
+#usr/lib/python3.10/site-packages/hatchling/metadata
+#usr/lib/python3.10/site-packages/hatchling/metadata/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/core.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/custom.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/spec.py
+#usr/lib/python3.10/site-packages/hatchling/metadata/utils.py
+#usr/lib/python3.10/site-packages/hatchling/ouroboros.py
+#usr/lib/python3.10/site-packages/hatchling/plugin
+#usr/lib/python3.10/site-packages/hatchling/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/exceptions.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/manager.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/specs.py
+#usr/lib/python3.10/site-packages/hatchling/plugin/utils.py
+#usr/lib/python3.10/site-packages/hatchling/py.typed
+#usr/lib/python3.10/site-packages/hatchling/utils
+#usr/lib/python3.10/site-packages/hatchling/utils/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/utils/constants.py
+#usr/lib/python3.10/site-packages/hatchling/utils/context.py
+#usr/lib/python3.10/site-packages/hatchling/utils/fs.py
+#usr/lib/python3.10/site-packages/hatchling/version
+#usr/lib/python3.10/site-packages/hatchling/version/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/core.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/version/scheme/standard.py
+#usr/lib/python3.10/site-packages/hatchling/version/source
+#usr/lib/python3.10/site-packages/hatchling/version/source/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/code.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/env.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin/__init__.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin/hooks.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/plugin/interface.py
+#usr/lib/python3.10/site-packages/hatchling/version/source/regex.py
--- /dev/null
+#usr/lib/python3.10/site-packages/pathspec
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/METADATA
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/RECORD
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/pathspec-0.12.1.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/pathspec/__init__.py
+#usr/lib/python3.10/site-packages/pathspec/_meta.py
+#usr/lib/python3.10/site-packages/pathspec/gitignore.py
+#usr/lib/python3.10/site-packages/pathspec/pathspec.py
+#usr/lib/python3.10/site-packages/pathspec/pattern.py
+#usr/lib/python3.10/site-packages/pathspec/patterns
+#usr/lib/python3.10/site-packages/pathspec/patterns/__init__.py
+#usr/lib/python3.10/site-packages/pathspec/patterns/gitwildmatch.py
+#usr/lib/python3.10/site-packages/pathspec/py.typed
+#usr/lib/python3.10/site-packages/pathspec/util.py
--- /dev/null
+#usr/lib/python3.10/site-packages/pluggy
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/pluggy-1.4.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pluggy/__init__.py
+#usr/lib/python3.10/site-packages/pluggy/_callers.py
+#usr/lib/python3.10/site-packages/pluggy/_hooks.py
+#usr/lib/python3.10/site-packages/pluggy/_manager.py
+#usr/lib/python3.10/site-packages/pluggy/_result.py
+#usr/lib/python3.10/site-packages/pluggy/_tracing.py
+#usr/lib/python3.10/site-packages/pluggy/_version.py
+#usr/lib/python3.10/site-packages/pluggy/_warnings.py
+#usr/lib/python3.10/site-packages/pluggy/py.typed
--- /dev/null
+#usr/lib/python3.10/site-packages/trove_classifiers
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/trove_classifiers-2024.1.8-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/trove_classifiers/__init__.py
+#usr/lib/python3.10/site-packages/trove_classifiers/__main__.py
+#usr/lib/python3.10/site-packages/trove_classifiers/py.typed
#usr/lib/ldscripts/elf64lriscv_lp64f.xu
#usr/lib/ldscripts/elf64lriscv_lp64f.xw
#usr/lib/ldscripts/elf64lriscv_lp64f.xwe
-usr/lib/libbfd-2.41.so
+#usr/lib/ldscripts/stamp
+usr/lib/libbfd-2.42.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
#usr/lib/libctf.so
usr/lib/libctf.so.0
usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.41.so
+usr/lib/libopcodes-2.42.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
#usr/share/locale/ja/LC_MESSAGES/ld.mo
#usr/share/locale/ka/LC_MESSAGES/bfd.mo
#usr/share/locale/ka/LC_MESSAGES/gprof.mo
+#usr/share/locale/ka/LC_MESSAGES/ld.mo
#usr/share/locale/ms
#usr/share/locale/ms/LC_MESSAGES
#usr/share/locale/ms/LC_MESSAGES/gprof.mo
#usr/share/locale/ro/LC_MESSAGES/bfd.mo
#usr/share/locale/ro/LC_MESSAGES/binutils.mo
#usr/share/locale/ro/LC_MESSAGES/gprof.mo
+#usr/share/locale/ro/LC_MESSAGES/ld.mo
#usr/share/locale/ro/LC_MESSAGES/opcodes.mo
#usr/share/locale/ru/LC_MESSAGES/bfd.mo
#usr/share/locale/ru/LC_MESSAGES/binutils.mo
#usr/include/bits/param.h
#usr/include/bits/poll.h
#usr/include/bits/poll2.h
+#usr/include/bits/platform/features.h
#usr/include/bits/posix1_lim.h
#usr/include/bits/posix2_lim.h
#usr/include/bits/posix_opt.h
#usr/include/bits/socket.h
#usr/include/bits/socket2.h
#usr/include/bits/socket_type.h
+#usr/include/bits/spawn_ext.h
#usr/include/bits/ss_flags.h
#usr/include/bits/stab.def
#usr/include/bits/stat.h
#usr/include/bits/statx-generic.h
#usr/include/bits/statx.h
#usr/include/bits/stdint-intn.h
+#usr/include/bits/stdint-least.h
#usr/include/bits/stdint-uintn.h
#usr/include/bits/stdio-ldbl.h
#usr/include/bits/stdio.h
#usr/include/signal.h
#usr/include/spawn.h
#usr/include/stab.h
+#usr/include/stdbit.h
#usr/include/stdc-predef.h
#usr/include/stdint.h
#usr/include/stdio.h
#usr/lib/locale/aa_ER/LC_PAPER
#usr/lib/locale/aa_ER/LC_TELEPHONE
#usr/lib/locale/aa_ER/LC_TIME
-#usr/lib/locale/aa_ER@saaho
-#usr/lib/locale/aa_ER@saaho/LC_ADDRESS
-#usr/lib/locale/aa_ER@saaho/LC_COLLATE
-#usr/lib/locale/aa_ER@saaho/LC_CTYPE
-#usr/lib/locale/aa_ER@saaho/LC_IDENTIFICATION
-#usr/lib/locale/aa_ER@saaho/LC_MEASUREMENT
-#usr/lib/locale/aa_ER@saaho/LC_MESSAGES
-#usr/lib/locale/aa_ER@saaho/LC_MESSAGES/SYS_LC_MESSAGES
-#usr/lib/locale/aa_ER@saaho/LC_MONETARY
-#usr/lib/locale/aa_ER@saaho/LC_NAME
-#usr/lib/locale/aa_ER@saaho/LC_NUMERIC
-#usr/lib/locale/aa_ER@saaho/LC_PAPER
-#usr/lib/locale/aa_ER@saaho/LC_TELEPHONE
-#usr/lib/locale/aa_ER@saaho/LC_TIME
#usr/lib/locale/aa_ET
#usr/lib/locale/aa_ET/LC_ADDRESS
#usr/lib/locale/aa_ET/LC_COLLATE
#usr/lib/locale/cmn_TW/LC_PAPER
#usr/lib/locale/cmn_TW/LC_TELEPHONE
#usr/lib/locale/cmn_TW/LC_TIME
+#usr/lib/locale/crh_RU
+#usr/lib/locale/crh_RU/LC_ADDRESS
+#usr/lib/locale/crh_RU/LC_COLLATE
+#usr/lib/locale/crh_RU/LC_CTYPE
+#usr/lib/locale/crh_RU/LC_IDENTIFICATION
+#usr/lib/locale/crh_RU/LC_MEASUREMENT
+#usr/lib/locale/crh_RU/LC_MESSAGES
+#usr/lib/locale/crh_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/crh_RU/LC_MONETARY
+#usr/lib/locale/crh_RU/LC_NAME
+#usr/lib/locale/crh_RU/LC_NUMERIC
+#usr/lib/locale/crh_RU/LC_PAPER
+#usr/lib/locale/crh_RU/LC_TELEPHONE
+#usr/lib/locale/crh_RU/LC_TIME
#usr/lib/locale/crh_UA
#usr/lib/locale/crh_UA/LC_ADDRESS
#usr/lib/locale/crh_UA/LC_COLLATE
#usr/lib/locale/ga_IE@euro/LC_PAPER
#usr/lib/locale/ga_IE@euro/LC_TELEPHONE
#usr/lib/locale/ga_IE@euro/LC_TIME
+#usr/lib/locale/gbm_IN
+#usr/lib/locale/gbm_IN/LC_ADDRESS
+#usr/lib/locale/gbm_IN/LC_COLLATE
+#usr/lib/locale/gbm_IN/LC_CTYPE
+#usr/lib/locale/gbm_IN/LC_IDENTIFICATION
+#usr/lib/locale/gbm_IN/LC_MEASUREMENT
+#usr/lib/locale/gbm_IN/LC_MESSAGES
+#usr/lib/locale/gbm_IN/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/gbm_IN/LC_MONETARY
+#usr/lib/locale/gbm_IN/LC_NAME
+#usr/lib/locale/gbm_IN/LC_NUMERIC
+#usr/lib/locale/gbm_IN/LC_PAPER
+#usr/lib/locale/gbm_IN/LC_TELEPHONE
+#usr/lib/locale/gbm_IN/LC_TIME
#usr/lib/locale/gd_GB
#usr/lib/locale/gd_GB.utf8
#usr/lib/locale/gd_GB.utf8/LC_ADDRESS
#usr/lib/locale/ku_TR/LC_PAPER
#usr/lib/locale/ku_TR/LC_TELEPHONE
#usr/lib/locale/ku_TR/LC_TIME
+#usr/lib/locale/kv_RU
+#usr/lib/locale/kv_RU/LC_ADDRESS
+#usr/lib/locale/kv_RU/LC_COLLATE
+#usr/lib/locale/kv_RU/LC_CTYPE
+#usr/lib/locale/kv_RU/LC_IDENTIFICATION
+#usr/lib/locale/kv_RU/LC_MEASUREMENT
+#usr/lib/locale/kv_RU/LC_MESSAGES
+#usr/lib/locale/kv_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/kv_RU/LC_MONETARY
+#usr/lib/locale/kv_RU/LC_NAME
+#usr/lib/locale/kv_RU/LC_NUMERIC
+#usr/lib/locale/kv_RU/LC_PAPER
+#usr/lib/locale/kv_RU/LC_TELEPHONE
+#usr/lib/locale/kv_RU/LC_TIME
#usr/lib/locale/kw_GB
#usr/lib/locale/kw_GB.utf8
#usr/lib/locale/kw_GB.utf8/LC_ADDRESS
#usr/lib/locale/ss_ZA/LC_PAPER
#usr/lib/locale/ss_ZA/LC_TELEPHONE
#usr/lib/locale/ss_ZA/LC_TIME
+#usr/lib/locale/ssy_ER
+#usr/lib/locale/ssy_ER/LC_ADDRESS
+#usr/lib/locale/ssy_ER/LC_COLLATE
+#usr/lib/locale/ssy_ER/LC_CTYPE
+#usr/lib/locale/ssy_ER/LC_IDENTIFICATION
+#usr/lib/locale/ssy_ER/LC_MEASUREMENT
+#usr/lib/locale/ssy_ER/LC_MESSAGES
+#usr/lib/locale/ssy_ER/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ssy_ER/LC_MONETARY
+#usr/lib/locale/ssy_ER/LC_NAME
+#usr/lib/locale/ssy_ER/LC_NUMERIC
+#usr/lib/locale/ssy_ER/LC_PAPER
+#usr/lib/locale/ssy_ER/LC_TELEPHONE
+#usr/lib/locale/ssy_ER/LC_TIME
#usr/lib/locale/st_ZA
#usr/lib/locale/st_ZA.utf8
#usr/lib/locale/st_ZA.utf8/LC_ADDRESS
#usr/lib/locale/st_ZA/LC_PAPER
#usr/lib/locale/st_ZA/LC_TELEPHONE
#usr/lib/locale/st_ZA/LC_TIME
+#usr/lib/locale/su_ID
+#usr/lib/locale/su_ID/LC_ADDRESS
+#usr/lib/locale/su_ID/LC_COLLATE
+#usr/lib/locale/su_ID/LC_CTYPE
+#usr/lib/locale/su_ID/LC_IDENTIFICATION
+#usr/lib/locale/su_ID/LC_MEASUREMENT
+#usr/lib/locale/su_ID/LC_MESSAGES
+#usr/lib/locale/su_ID/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/su_ID/LC_MONETARY
+#usr/lib/locale/su_ID/LC_NAME
+#usr/lib/locale/su_ID/LC_NUMERIC
+#usr/lib/locale/su_ID/LC_PAPER
+#usr/lib/locale/su_ID/LC_TELEPHONE
+#usr/lib/locale/su_ID/LC_TIME
#usr/lib/locale/sv_FI
#usr/lib/locale/sv_FI.utf8
#usr/lib/locale/sv_FI.utf8/LC_ADDRESS
#usr/lib/locale/to_TO/LC_PAPER
#usr/lib/locale/to_TO/LC_TELEPHONE
#usr/lib/locale/to_TO/LC_TIME
+#usr/lib/locale/tok
+#usr/lib/locale/tok/LC_ADDRESS
+#usr/lib/locale/tok/LC_COLLATE
+#usr/lib/locale/tok/LC_CTYPE
+#usr/lib/locale/tok/LC_IDENTIFICATION
+#usr/lib/locale/tok/LC_MEASUREMENT
+#usr/lib/locale/tok/LC_MESSAGES
+#usr/lib/locale/tok/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/tok/LC_MONETARY
+#usr/lib/locale/tok/LC_NAME
+#usr/lib/locale/tok/LC_NUMERIC
+#usr/lib/locale/tok/LC_PAPER
+#usr/lib/locale/tok/LC_TELEPHONE
+#usr/lib/locale/tok/LC_TIME
#usr/lib/locale/tpi_PG
#usr/lib/locale/tpi_PG/LC_ADDRESS
#usr/lib/locale/tpi_PG/LC_COLLATE
#usr/lib/locale/yuw_PG/LC_PAPER
#usr/lib/locale/yuw_PG/LC_TELEPHONE
#usr/lib/locale/yuw_PG/LC_TIME
+#usr/lib/locale/zgh_MA
+#usr/lib/locale/zgh_MA/LC_ADDRESS
+#usr/lib/locale/zgh_MA/LC_COLLATE
+#usr/lib/locale/zgh_MA/LC_CTYPE
+#usr/lib/locale/zgh_MA/LC_IDENTIFICATION
+#usr/lib/locale/zgh_MA/LC_MEASUREMENT
+#usr/lib/locale/zgh_MA/LC_MESSAGES
+#usr/lib/locale/zgh_MA/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/zgh_MA/LC_MONETARY
+#usr/lib/locale/zgh_MA/LC_NAME
+#usr/lib/locale/zgh_MA/LC_NUMERIC
+#usr/lib/locale/zgh_MA/LC_PAPER
+#usr/lib/locale/zgh_MA/LC_TELEPHONE
+#usr/lib/locale/zgh_MA/LC_TIME
#usr/lib/locale/zh_CN
#usr/lib/locale/zh_CN.gb18030
#usr/lib/locale/zh_CN.gb18030/LC_ADDRESS
#usr/share/i18n/locales/POSIX
#usr/share/i18n/locales/aa_DJ
#usr/share/i18n/locales/aa_ER
-#usr/share/i18n/locales/aa_ER@saaho
#usr/share/i18n/locales/aa_ET
#usr/share/i18n/locales/ab_GE
#usr/share/i18n/locales/af_ZA
#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
+#usr/share/i18n/locales/crh_RU
#usr/share/i18n/locales/crh_UA
#usr/share/i18n/locales/cs_CZ
#usr/share/i18n/locales/csb_PL
#usr/share/i18n/locales/fy_NL
#usr/share/i18n/locales/ga_IE
#usr/share/i18n/locales/ga_IE@euro
+#usr/share/i18n/locales/gbm_IN
#usr/share/i18n/locales/gd_GB
#usr/share/i18n/locales/gez_ER
#usr/share/i18n/locales/gez_ER@abegede
#usr/share/i18n/locales/ks_IN
#usr/share/i18n/locales/ks_IN@devanagari
#usr/share/i18n/locales/ku_TR
+#usr/share/i18n/locales/kv_RU
#usr/share/i18n/locales/kw_GB
#usr/share/i18n/locales/ky_KG
#usr/share/i18n/locales/lb_LU
#usr/share/i18n/locales/sr_RS
#usr/share/i18n/locales/sr_RS@latin
#usr/share/i18n/locales/ss_ZA
+#usr/share/i18n/locales/ssy_ER
#usr/share/i18n/locales/st_ZA
+#usr/share/i18n/locales/su_ID
#usr/share/i18n/locales/sv_FI
#usr/share/i18n/locales/sv_FI@euro
#usr/share/i18n/locales/sv_SE
#usr/share/i18n/locales/tl_PH
#usr/share/i18n/locales/tn_ZA
#usr/share/i18n/locales/to_TO
+#usr/share/i18n/locales/tok
#usr/share/i18n/locales/tpi_PG
#usr/share/i18n/locales/tr_CY
#usr/share/i18n/locales/tr_TR
#usr/share/i18n/locales/translit_cjk_variants
#usr/share/i18n/locales/translit_combining
#usr/share/i18n/locales/translit_compat
+#usr/share/i18n/locales/translit_emojis
#usr/share/i18n/locales/translit_font
#usr/share/i18n/locales/translit_fraction
#usr/share/i18n/locales/translit_hangul
#usr/share/i18n/locales/yo_NG
#usr/share/i18n/locales/yue_HK
#usr/share/i18n/locales/yuw_PG
+#usr/share/i18n/locales/zgh_MA
#usr/share/i18n/locales/zh_CN
#usr/share/i18n/locales/zh_HK
#usr/share/i18n/locales/zh_SG
#usr/share/info/libc.info-16
#usr/share/info/libc.info-17
#usr/share/info/libc.info-18
+#usr/share/info/libc.info-19
#usr/share/info/libc.info-2
#usr/share/info/libc.info-3
#usr/share/info/libc.info-4
#etc/rc.d/init.d/networking/red.up/35-guardian
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
+etc/rc.d/init.d/networking/red.up/60-collectd
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
#lib/modules/KVER-ipfire/build/include/config/LEDS_USER
#lib/modules/KVER-ipfire/build/include/config/LED_TRIGGER_PHY
#lib/modules/KVER-ipfire/build/include/config/LEGACY_DIRECT_IO
-#lib/modules/KVER-ipfire/build/include/config/LEGACY_TIOCSTI
#lib/modules/KVER-ipfire/build/include/config/LIB80211
#lib/modules/KVER-ipfire/build/include/config/LIB80211_CRYPT_CCMP
#lib/modules/KVER-ipfire/build/include/config/LIB80211_CRYPT_TKIP
etc/suricata
etc/suricata/suricata.yaml
usr/bin/suricata
-#usr/include/suricata-plugin.h
usr/sbin/convert-ids-backend-files
#usr/share/doc/suricata
#usr/share/doc/suricata/AUTHORS
#usr/share/suricata/rules/dnp3-events.rules
#usr/share/suricata/rules/dns-events.rules
#usr/share/suricata/rules/files.rules
+#usr/share/suricata/rules/ftp-events.rules
#usr/share/suricata/rules/http-events.rules
#usr/share/suricata/rules/http2-events.rules
#usr/share/suricata/rules/ipsec-events.rules
#usr/share/suricata/rules/mqtt-events.rules
#usr/share/suricata/rules/nfs-events.rules
#usr/share/suricata/rules/ntp-events.rules
+#usr/share/suricata/rules/quic-events.rules
#usr/share/suricata/rules/rfb-events.rules
#usr/share/suricata/rules/smb-events.rules
#usr/share/suricata/rules/smtp-events.rules
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.1.23
+usr/lib/libunbound.so.8.1.24
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor
srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/modem.cgi
#srv/web/ipfire/cgi-bin/mpfire.cgi
+#srv/web/ipfire/cgi-bin/mympd.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/netother.cgi
srv/web/ipfire/cgi-bin/time.cgi
#srv/web/ipfire/cgi-bin/tor.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
+#srv/web/ipfire/cgi-bin/transmission.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
+#srv/web/ipfire/cgi-bin/vdr.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/vulnerabilities.cgi
srv/web/ipfire/cgi-bin/wakeonlan.cgi
srv/web/ipfire/cgi-bin/webaccess.cgi
-srv/web/ipfire/cgi-bin/wireless.cgi
-srv/web/ipfire/cgi-bin/wirelessclient.cgi
#srv/web/ipfire/cgi-bin/wio.cgi
#srv/web/ipfire/cgi-bin/wiographs.cgi
+srv/web/ipfire/cgi-bin/wireless.cgi
+srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/cgi-bin/wlanap.cgi
srv/web/ipfire/cgi-bin/zoneconf.cgi
#srv/web/ipfire/html
srv/web/ipfire/html/images/wio/no_graph.png
srv/web/ipfire/html/images/wio/none.png
srv/web/ipfire/html/images/wio/orange.png
-srv/web/ipfire/html/images/wio/ovpnn2n.png
srv/web/ipfire/html/images/wio/ovpn.png
+srv/web/ipfire/html/images/wio/ovpnn2n.png
srv/web/ipfire/html/images/wio/ovpnrw.png
srv/web/ipfire/html/images/wio/red.png
srv/web/ipfire/html/images/wio/refresh.png
-srv/web/ipfire/html/images/wio/vpnn2n.png
srv/web/ipfire/html/images/wio/vpn.png
+srv/web/ipfire/html/images/wio/vpnn2n.png
srv/web/ipfire/html/images/wio/vpnrw.png
srv/web/ipfire/html/images/wio/white.png
srv/web/ipfire/html/include
srv/web/ipfire/html/redirect.cgi
srv/web/ipfire/html/themes
srv/web/ipfire/html/themes/ipfire
-srv/web/ipfire/html/themes/ipfire/images
-srv/web/ipfire/html/themes/ipfire/images/n2.gif
-srv/web/ipfire/html/themes/ipfire/images/n3.gif
-srv/web/ipfire/html/themes/ipfire/images/n5.gif
-srv/web/ipfire/html/themes/ipfire/images/n6.gif
-srv/web/ipfire/html/themes/ipfire/images/tux2.png
srv/web/ipfire/html/themes/ipfire/include
srv/web/ipfire/html/themes/ipfire/include/colors.txt
srv/web/ipfire/html/themes/ipfire/include/css
srv/web/ipfire/html/themes/ipfire/include/css/style.css
+#srv/web/ipfire/html/themes/ipfire/include/fonts
+srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Bold.ttf
+srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Medium.ttf
+srv/web/ipfire/html/themes/ipfire/include/fonts/Prompt-Regular.ttf
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/ipfire/include/js
srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
#usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.41.so
+#usr/lib/ldscripts/stamp
+usr/lib/libbfd-2.42.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
#usr/lib/libgprofng.so
usr/lib/libgprofng.so.0
usr/lib/libgprofng.so.0.0.0
-usr/lib/libopcodes-2.41.so
+usr/lib/libopcodes-2.42.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
#usr/share/locale/ja/LC_MESSAGES/ld.mo
#usr/share/locale/ka/LC_MESSAGES/bfd.mo
#usr/share/locale/ka/LC_MESSAGES/gprof.mo
+#usr/share/locale/ka/LC_MESSAGES/ld.mo
#usr/share/locale/ms
#usr/share/locale/ms/LC_MESSAGES
#usr/share/locale/ms/LC_MESSAGES/gprof.mo
#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-#usr/share/locale/ro
-#usr/share/locale/ro/LC_MESSAGES
#usr/share/locale/ro/LC_MESSAGES/bfd.mo
#usr/share/locale/ro/LC_MESSAGES/binutils.mo
#usr/share/locale/ro/LC_MESSAGES/gprof.mo
+#usr/share/locale/ro/LC_MESSAGES/ld.mo
#usr/share/locale/ro/LC_MESSAGES/opcodes.mo
#usr/share/locale/ru/LC_MESSAGES/bfd.mo
#usr/share/locale/ru/LC_MESSAGES/binutils.mo
#usr/include/bits/netdb.h
#usr/include/bits/param.h
#usr/include/bits/platform
+#usr/include/bits/platform/features.h
#usr/include/bits/platform/x86.h
#usr/include/bits/poll.h
#usr/include/bits/poll2.h
#usr/include/bits/socket.h
#usr/include/bits/socket2.h
#usr/include/bits/socket_type.h
+#usr/include/bits/spawn_ext.h
#usr/include/bits/ss_flags.h
#usr/include/bits/stab.def
#usr/include/bits/stat.h
#usr/include/bits/statx-generic.h
#usr/include/bits/statx.h
#usr/include/bits/stdint-intn.h
+#usr/include/bits/stdint-least.h
#usr/include/bits/stdint-uintn.h
#usr/include/bits/stdio-ldbl.h
#usr/include/bits/stdio.h
#usr/include/signal.h
#usr/include/spawn.h
#usr/include/stab.h
+#usr/include/stdbit.h
#usr/include/stdc-predef.h
#usr/include/stdint.h
#usr/include/stdio.h
#usr/lib/libc_nonshared.a
#usr/lib/libdl.a
#usr/lib/libg.a
-#usr/lib/libm-2.38.a
+#usr/lib/libm-2.39.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
#usr/lib/locale/aa_ER/LC_PAPER
#usr/lib/locale/aa_ER/LC_TELEPHONE
#usr/lib/locale/aa_ER/LC_TIME
-#usr/lib/locale/aa_ER@saaho
-#usr/lib/locale/aa_ER@saaho/LC_ADDRESS
-#usr/lib/locale/aa_ER@saaho/LC_COLLATE
-#usr/lib/locale/aa_ER@saaho/LC_CTYPE
-#usr/lib/locale/aa_ER@saaho/LC_IDENTIFICATION
-#usr/lib/locale/aa_ER@saaho/LC_MEASUREMENT
-#usr/lib/locale/aa_ER@saaho/LC_MESSAGES
-#usr/lib/locale/aa_ER@saaho/LC_MESSAGES/SYS_LC_MESSAGES
-#usr/lib/locale/aa_ER@saaho/LC_MONETARY
-#usr/lib/locale/aa_ER@saaho/LC_NAME
-#usr/lib/locale/aa_ER@saaho/LC_NUMERIC
-#usr/lib/locale/aa_ER@saaho/LC_PAPER
-#usr/lib/locale/aa_ER@saaho/LC_TELEPHONE
-#usr/lib/locale/aa_ER@saaho/LC_TIME
#usr/lib/locale/aa_ET
#usr/lib/locale/aa_ET/LC_ADDRESS
#usr/lib/locale/aa_ET/LC_COLLATE
#usr/lib/locale/cmn_TW/LC_PAPER
#usr/lib/locale/cmn_TW/LC_TELEPHONE
#usr/lib/locale/cmn_TW/LC_TIME
+#usr/lib/locale/crh_RU
+#usr/lib/locale/crh_RU/LC_ADDRESS
+#usr/lib/locale/crh_RU/LC_COLLATE
+#usr/lib/locale/crh_RU/LC_CTYPE
+#usr/lib/locale/crh_RU/LC_IDENTIFICATION
+#usr/lib/locale/crh_RU/LC_MEASUREMENT
+#usr/lib/locale/crh_RU/LC_MESSAGES
+#usr/lib/locale/crh_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/crh_RU/LC_MONETARY
+#usr/lib/locale/crh_RU/LC_NAME
+#usr/lib/locale/crh_RU/LC_NUMERIC
+#usr/lib/locale/crh_RU/LC_PAPER
+#usr/lib/locale/crh_RU/LC_TELEPHONE
+#usr/lib/locale/crh_RU/LC_TIME
#usr/lib/locale/crh_UA
#usr/lib/locale/crh_UA/LC_ADDRESS
#usr/lib/locale/crh_UA/LC_COLLATE
#usr/lib/locale/ga_IE@euro/LC_PAPER
#usr/lib/locale/ga_IE@euro/LC_TELEPHONE
#usr/lib/locale/ga_IE@euro/LC_TIME
+#usr/lib/locale/gbm_IN
+#usr/lib/locale/gbm_IN/LC_ADDRESS
+#usr/lib/locale/gbm_IN/LC_COLLATE
+#usr/lib/locale/gbm_IN/LC_CTYPE
+#usr/lib/locale/gbm_IN/LC_IDENTIFICATION
+#usr/lib/locale/gbm_IN/LC_MEASUREMENT
+#usr/lib/locale/gbm_IN/LC_MESSAGES
+#usr/lib/locale/gbm_IN/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/gbm_IN/LC_MONETARY
+#usr/lib/locale/gbm_IN/LC_NAME
+#usr/lib/locale/gbm_IN/LC_NUMERIC
+#usr/lib/locale/gbm_IN/LC_PAPER
+#usr/lib/locale/gbm_IN/LC_TELEPHONE
+#usr/lib/locale/gbm_IN/LC_TIME
#usr/lib/locale/gd_GB
#usr/lib/locale/gd_GB.utf8
#usr/lib/locale/gd_GB.utf8/LC_ADDRESS
#usr/lib/locale/ku_TR/LC_PAPER
#usr/lib/locale/ku_TR/LC_TELEPHONE
#usr/lib/locale/ku_TR/LC_TIME
+#usr/lib/locale/kv_RU
+#usr/lib/locale/kv_RU/LC_ADDRESS
+#usr/lib/locale/kv_RU/LC_COLLATE
+#usr/lib/locale/kv_RU/LC_CTYPE
+#usr/lib/locale/kv_RU/LC_IDENTIFICATION
+#usr/lib/locale/kv_RU/LC_MEASUREMENT
+#usr/lib/locale/kv_RU/LC_MESSAGES
+#usr/lib/locale/kv_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/kv_RU/LC_MONETARY
+#usr/lib/locale/kv_RU/LC_NAME
+#usr/lib/locale/kv_RU/LC_NUMERIC
+#usr/lib/locale/kv_RU/LC_PAPER
+#usr/lib/locale/kv_RU/LC_TELEPHONE
+#usr/lib/locale/kv_RU/LC_TIME
#usr/lib/locale/kw_GB
#usr/lib/locale/kw_GB.utf8
#usr/lib/locale/kw_GB.utf8/LC_ADDRESS
#usr/lib/locale/ss_ZA/LC_PAPER
#usr/lib/locale/ss_ZA/LC_TELEPHONE
#usr/lib/locale/ss_ZA/LC_TIME
+#usr/lib/locale/ssy_ER
+#usr/lib/locale/ssy_ER/LC_ADDRESS
+#usr/lib/locale/ssy_ER/LC_COLLATE
+#usr/lib/locale/ssy_ER/LC_CTYPE
+#usr/lib/locale/ssy_ER/LC_IDENTIFICATION
+#usr/lib/locale/ssy_ER/LC_MEASUREMENT
+#usr/lib/locale/ssy_ER/LC_MESSAGES
+#usr/lib/locale/ssy_ER/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ssy_ER/LC_MONETARY
+#usr/lib/locale/ssy_ER/LC_NAME
+#usr/lib/locale/ssy_ER/LC_NUMERIC
+#usr/lib/locale/ssy_ER/LC_PAPER
+#usr/lib/locale/ssy_ER/LC_TELEPHONE
+#usr/lib/locale/ssy_ER/LC_TIME
#usr/lib/locale/st_ZA
#usr/lib/locale/st_ZA.utf8
#usr/lib/locale/st_ZA.utf8/LC_ADDRESS
#usr/lib/locale/st_ZA/LC_PAPER
#usr/lib/locale/st_ZA/LC_TELEPHONE
#usr/lib/locale/st_ZA/LC_TIME
+#usr/lib/locale/su_ID
+#usr/lib/locale/su_ID/LC_ADDRESS
+#usr/lib/locale/su_ID/LC_COLLATE
+#usr/lib/locale/su_ID/LC_CTYPE
+#usr/lib/locale/su_ID/LC_IDENTIFICATION
+#usr/lib/locale/su_ID/LC_MEASUREMENT
+#usr/lib/locale/su_ID/LC_MESSAGES
+#usr/lib/locale/su_ID/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/su_ID/LC_MONETARY
+#usr/lib/locale/su_ID/LC_NAME
+#usr/lib/locale/su_ID/LC_NUMERIC
+#usr/lib/locale/su_ID/LC_PAPER
+#usr/lib/locale/su_ID/LC_TELEPHONE
+#usr/lib/locale/su_ID/LC_TIME
#usr/lib/locale/sv_FI
#usr/lib/locale/sv_FI.utf8
#usr/lib/locale/sv_FI.utf8/LC_ADDRESS
#usr/lib/locale/to_TO/LC_PAPER
#usr/lib/locale/to_TO/LC_TELEPHONE
#usr/lib/locale/to_TO/LC_TIME
+#usr/lib/locale/tok
+#usr/lib/locale/tok/LC_ADDRESS
+#usr/lib/locale/tok/LC_COLLATE
+#usr/lib/locale/tok/LC_CTYPE
+#usr/lib/locale/tok/LC_IDENTIFICATION
+#usr/lib/locale/tok/LC_MEASUREMENT
+#usr/lib/locale/tok/LC_MESSAGES
+#usr/lib/locale/tok/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/tok/LC_MONETARY
+#usr/lib/locale/tok/LC_NAME
+#usr/lib/locale/tok/LC_NUMERIC
+#usr/lib/locale/tok/LC_PAPER
+#usr/lib/locale/tok/LC_TELEPHONE
+#usr/lib/locale/tok/LC_TIME
#usr/lib/locale/tpi_PG
#usr/lib/locale/tpi_PG/LC_ADDRESS
#usr/lib/locale/tpi_PG/LC_COLLATE
#usr/lib/locale/yuw_PG/LC_PAPER
#usr/lib/locale/yuw_PG/LC_TELEPHONE
#usr/lib/locale/yuw_PG/LC_TIME
+#usr/lib/locale/zgh_MA
+#usr/lib/locale/zgh_MA/LC_ADDRESS
+#usr/lib/locale/zgh_MA/LC_COLLATE
+#usr/lib/locale/zgh_MA/LC_CTYPE
+#usr/lib/locale/zgh_MA/LC_IDENTIFICATION
+#usr/lib/locale/zgh_MA/LC_MEASUREMENT
+#usr/lib/locale/zgh_MA/LC_MESSAGES
+#usr/lib/locale/zgh_MA/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/zgh_MA/LC_MONETARY
+#usr/lib/locale/zgh_MA/LC_NAME
+#usr/lib/locale/zgh_MA/LC_NUMERIC
+#usr/lib/locale/zgh_MA/LC_PAPER
+#usr/lib/locale/zgh_MA/LC_TELEPHONE
+#usr/lib/locale/zgh_MA/LC_TIME
#usr/lib/locale/zh_CN
#usr/lib/locale/zh_CN.gb18030
#usr/lib/locale/zh_CN.gb18030/LC_ADDRESS
#usr/share/i18n/locales/POSIX
#usr/share/i18n/locales/aa_DJ
#usr/share/i18n/locales/aa_ER
-#usr/share/i18n/locales/aa_ER@saaho
#usr/share/i18n/locales/aa_ET
#usr/share/i18n/locales/ab_GE
#usr/share/i18n/locales/af_ZA
#usr/share/i18n/locales/ckb_IQ
#usr/share/i18n/locales/cmn_TW
#usr/share/i18n/locales/cns11643_stroke
+#usr/share/i18n/locales/crh_RU
#usr/share/i18n/locales/crh_UA
#usr/share/i18n/locales/cs_CZ
#usr/share/i18n/locales/csb_PL
#usr/share/i18n/locales/fy_NL
#usr/share/i18n/locales/ga_IE
#usr/share/i18n/locales/ga_IE@euro
+#usr/share/i18n/locales/gbm_IN
#usr/share/i18n/locales/gd_GB
#usr/share/i18n/locales/gez_ER
#usr/share/i18n/locales/gez_ER@abegede
#usr/share/i18n/locales/ks_IN
#usr/share/i18n/locales/ks_IN@devanagari
#usr/share/i18n/locales/ku_TR
+#usr/share/i18n/locales/kv_RU
#usr/share/i18n/locales/kw_GB
#usr/share/i18n/locales/ky_KG
#usr/share/i18n/locales/lb_LU
#usr/share/i18n/locales/sr_RS
#usr/share/i18n/locales/sr_RS@latin
#usr/share/i18n/locales/ss_ZA
+#usr/share/i18n/locales/ssy_ER
#usr/share/i18n/locales/st_ZA
+#usr/share/i18n/locales/su_ID
#usr/share/i18n/locales/sv_FI
#usr/share/i18n/locales/sv_FI@euro
#usr/share/i18n/locales/sv_SE
#usr/share/i18n/locales/tl_PH
#usr/share/i18n/locales/tn_ZA
#usr/share/i18n/locales/to_TO
+#usr/share/i18n/locales/tok
#usr/share/i18n/locales/tpi_PG
#usr/share/i18n/locales/tr_CY
#usr/share/i18n/locales/tr_TR
#usr/share/i18n/locales/translit_cjk_variants
#usr/share/i18n/locales/translit_combining
#usr/share/i18n/locales/translit_compat
+#usr/share/i18n/locales/translit_emojis
#usr/share/i18n/locales/translit_font
#usr/share/i18n/locales/translit_fraction
#usr/share/i18n/locales/translit_hangul
#usr/share/i18n/locales/yo_NG
#usr/share/i18n/locales/yue_HK
#usr/share/i18n/locales/yuw_PG
+#usr/share/i18n/locales/zgh_MA
#usr/share/i18n/locales/zh_CN
#usr/share/i18n/locales/zh_HK
#usr/share/i18n/locales/zh_SG
#usr/share/info/libc.info-16
#usr/share/info/libc.info-17
#usr/share/info/libc.info-18
+#usr/share/info/libc.info-19
#usr/share/info/libc.info-2
#usr/share/info/libc.info-3
#usr/share/info/libc.info-4
#etc/rc.d/init.d/networking/red.up/35-guardian
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
+etc/rc.d/init.d/networking/red.up/60-collectd
etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-beep
etc/rc.d/init.d/networking/red.up/99-fireinfo
#lib/modules/KVER-ipfire/build/include/config/LEDS_USER
#lib/modules/KVER-ipfire/build/include/config/LED_TRIGGER_PHY
#lib/modules/KVER-ipfire/build/include/config/LEGACY_DIRECT_IO
-#lib/modules/KVER-ipfire/build/include/config/LEGACY_TIOCSTI
#lib/modules/KVER-ipfire/build/include/config/LEGACY_VSYSCALL_NONE
#lib/modules/KVER-ipfire/build/include/config/LIB80211
#lib/modules/KVER-ipfire/build/include/config/LIB80211_CRYPT_CCMP
#usr/lib/liblzma.la
#usr/lib/liblzma.so
usr/lib/liblzma.so.5
-usr/lib/liblzma.so.5.4.5
+usr/lib/liblzma.so.5.4.6
#usr/lib/pkgconfig/liblzma.pc
#usr/share/doc/xz
#usr/share/doc/xz/AUTHORS
lib/libz.so
lib/libz.so.1
-lib/libz.so.1.3
+lib/libz.so.1.3.1
#usr/include/zconf.h
#usr/include/zlib.h
#usr/lib/libz.a
+++ /dev/null
-srv/web/ipfire/cgi-bin/dhcp.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
-usr/local/bin/backupiso
--- /dev/null
+../../../../common/aarch64/binutils
\ No newline at end of file
--- /dev/null
+../../../../common/aarch64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/arping
\ No newline at end of file
--- /dev/null
+../../../common/ca-certificates
\ No newline at end of file
--- /dev/null
+../../../common/elfutils
\ No newline at end of file
--- /dev/null
+etc/sudoers.d/logwatch-mdadm
+lib/firmware/brcm/BCM-0a5c-6410.hcd
+lib/firmware/brcm/brcmfmac43012-sdio.bin
+lib/firmware/brcm/brcmfmac43012-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43430-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
+lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
+lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
+lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
+lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
+lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
+lib/firmware/brcm/brcmfmac4354-sdio.clm_blob
+lib/firmware/brcm/brcmfmac4356-pcie.clm_blob
+lib/firmware/brcm/brcmfmac4356-sdio.clm_blob
+lib/firmware/brcm/brcmfmac4356-sdio.khadas,vim2.txt
+lib/firmware/brcm/brcmfmac43570-pcie.clm_blob
+lib/firmware/brcm/brcmfmac4373-sdio.clm_blob
+lib/firmware/brcm/brcmfmac54591-pcie.bin
+lib/firmware/brcm/brcmfmac54591-pcie.clm_blob
+lib/firmware/cxgb4/t4-config.txt
+lib/firmware/cxgb4/t5-config.txt
+lib/firmware/cxgb4/t6-config.txt
+lib/firmware/intel/ice/ddp/ice.pkg
+lib/firmware/netronome/flower/nic_AMDA0058-0011_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0011_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0011_8x10.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0058-0012_8x10.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0011_8x10.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_1x100.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_2x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw
+lib/firmware/netronome/flower/nic_AMDA0078-0012_8x10.nffw
+lib/firmware/nvidia/tegra124/vic.bin
+lib/firmware/nvidia/tegra186/vic.bin
+lib/firmware/nvidia/tegra210/vic.bin
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/backup/bin/backup.pl
--- /dev/null
+../../../common/iproute2
\ No newline at end of file
--- /dev/null
+../../../common/libcap
\ No newline at end of file
--- /dev/null
+../../../common/ntp
\ No newline at end of file
--- /dev/null
+../../../../common/riscv64/binutils
\ No newline at end of file
--- /dev/null
+../../../../common/riscv64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/suricata
\ No newline at end of file
--- /dev/null
+../../../common/unbound
\ No newline at end of file
--- /dev/null
+../../../../common/x86_64/binutils
\ No newline at end of file
--- /dev/null
+../../../../common/x86_64/glibc
\ No newline at end of file
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=185
+
+# 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
+
+# Stop services
+/etc/init.d/ntp stop
+
+# Extract files
+extract_files
+
+# Remove files
+rm -rvf \
+ /etc/pango \
+ /lib/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp \
+ /lib/firmware/ath11k/IPQ6018/hw1.0/Notice.txt \
+ /lib/firmware/ath11k/IPQ8074/hw2.0/Notice.txt \
+ /lib/firmware/ath11k/QCA6390/hw2.0/Notice.txt \
+ /lib/firmware/ath11k/QCN9074/hw1.0/Notice.txt \
+ /lib/firmware/ath11k/WCN6855/hw2.0/Notice.txt \
+ /lib/firmware/intel-ucode/06-86-04 \
+ /lib/firmware/intel-ucode/06-86-05 \
+ /sbin/xtables-multi \
+ /srv/web/ipfire/html/themes/ipfire-rounded \
+ /usr/lib/crda/pubkeys/linville.key.pub.pem \
+ /usr/lib/grub/i386-pc/efiemu{32,64}.o \
+ /usr/lib/grub/i386-pc/verifiers.* \
+ /usr/lib/grub/i386-pc/verify.* \
+ /usr/lib/grub/x86_64-efi/shim_lock.* \
+ /usr/lib/grub/x86_64-efi/verifiers.* \
+ /usr/lib/grub/x86_64-efi/verify.* \
+ /usr/lib/snort_dynamic* \
+ /usr/local/bin/snortctrl \
+ /usr/share/usb_modeswitch/1033:0035 \
+ /usr/share/vim/vim7* \
+ /var/ipfire/geoip-functions.pl \
+ /var/ipfire/dhcpc/dhcpcd-hooks/00-linux \
+ /var/ipfire/dhcpc/dhcpcd-hooks/02-dump \
+ /var/lib/location/tmp*
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Fix permissions of /etc/sudoers.d/
+chmod -v 750 /etc/sudoers.d
+chmod -v 640 /etc/sudoers.d/*
+
+# Start services
+telinit u
+/etc/init.d/suricata restart
+/etc/init.d/unbound restart
+/etc/init.d/ntp start
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
--- /dev/null
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/lib/location/database.db
+var/lib/location/ipset
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
--- /dev/null
+../../../../common/aarch64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/bind
\ No newline at end of file
--- /dev/null
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
--- /dev/null
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/mountfs
+etc/rc.d/init.d/networking/red.up/60-collectd
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/local/bin/backupiso
+var/ipfire/backup/bin/backup.pl
+var/ipfire/header.pl
--- /dev/null
+../../../common/iputils
\ No newline at end of file
--- /dev/null
+../../../common/libhtp
\ No newline at end of file
--- /dev/null
+../../../../common/riscv64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/suricata
\ No newline at end of file
--- /dev/null
+../../../common/web-user-interface
\ No newline at end of file
--- /dev/null
+../../../../common/x86_64/glibc
\ No newline at end of file
# Remove files
rm -rvf \
/etc/fonts/conf.d/10-sub-pixel-rgb.conf \
+ /srv/web/ipfire/html/themes/ipfire/images \
/usr/lib/libbind9-9.16.44.so \
/usr/lib/libdns-9.16.44.so \
/usr/lib/libirs-9.16.44.so \
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
+# Relaunch init
+telinit u
+
# Apply local configuration to sshd_config
/usr/local/bin/sshctrl
+# Fix permissions of /etc/sudoers.d/
+chmod -v 750 /etc/sudoers.d
+chmod -v 640 /etc/sudoers.d/*
+
+# Check apache rsa key and replace if it is too small
+KEYSIZE=$(openssl rsa -in /etc/httpd/server.key -text -noout | sed -n 's/Private-Key:\ (\(.*\)\ bit.*/\1/p')
+if [ $KEYSIZE \< 2048 ]; then
+ echo "Generating new HTTPS RSA server key (this will take a moment)..."
+ openssl genrsa -out /etc/httpd/server.key 4096 &>/dev/null
+ chmod 600 /etc/httpd/server.key
+ sed "s/HOSTNAME/`hostname -f`/" < /etc/certparams | \
+ openssl req -new -key /etc/httpd/server.key \
+ -out /etc/httpd/server.csr &>/dev/null
+ openssl x509 -req -days 999999 -sha256 \
+ -in /etc/httpd/server.csr \
+ -signkey /etc/httpd/server.key \
+ -out /etc/httpd/server.crt &>/dev/null
+fi
+
# Start services
/etc/rc.d/init.d/apache start
if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/rc.d/init.d/ipsec start
fi
+/etc/init.d/suricata restart
# Rebuild initial ramdisks
dracut --regenerate-all --force
--- /dev/null
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+boot/uEnv.txt
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/lib/location/database.db
+var/lib/location/ipset
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
--- /dev/null
+../../../../common/aarch64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/acl
\ No newline at end of file
--- /dev/null
+../../../common/attr
\ No newline at end of file
--- /dev/null
+../../../common/bash
\ No newline at end of file
--- /dev/null
+../../../common/bind
\ No newline at end of file
--- /dev/null
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
--- /dev/null
+../../../common/dhcpcd
\ No newline at end of file
--- /dev/null
+../../../common/diffutils
\ No newline at end of file
--- /dev/null
+../../../common/ed
\ No newline at end of file
--- /dev/null
+../../../common/expat
\ No newline at end of file
--- /dev/null
+../../../common/file
\ No newline at end of file
--- /dev/null
+etc/rc.d/init.d/collectd
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/firewall/rules.pl
+var/ipfire/graphs.pl
+etc/collectd.conf
--- /dev/null
+../../../common/gettext
\ No newline at end of file
--- /dev/null
+../../../common/gnutls
\ No newline at end of file
--- /dev/null
+../../../common/iana-etc
\ No newline at end of file
--- /dev/null
+../../../common/iproute2
\ No newline at end of file
--- /dev/null
+../../../common/ipset
\ No newline at end of file
--- /dev/null
+../../../common/iputils
\ No newline at end of file
--- /dev/null
+../../../common/libhtp
\ No newline at end of file
--- /dev/null
+../../../common/libidn
\ No newline at end of file
--- /dev/null
+../../../common/libpng
\ No newline at end of file
--- /dev/null
+../../../common/lvm2
\ No newline at end of file
--- /dev/null
+../../../common/lzip
\ No newline at end of file
--- /dev/null
+../../../common/memtest
\ No newline at end of file
--- /dev/null
+../../../common/openssl
\ No newline at end of file
--- /dev/null
+../../../common/pam
\ No newline at end of file
--- /dev/null
+../../../common/pixman
\ No newline at end of file
--- /dev/null
+../../../common/poppler
\ No newline at end of file
--- /dev/null
+../../../common/readline
\ No newline at end of file
--- /dev/null
+../../../../common/riscv64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/shadow
\ No newline at end of file
--- /dev/null
+../../../common/sqlite
\ No newline at end of file
--- /dev/null
+../../../common/squid
\ No newline at end of file
--- /dev/null
+../../../common/suricata
\ No newline at end of file
--- /dev/null
+../../../common/unbound
\ No newline at end of file
--- /dev/null
+../../../common/vnstat
\ No newline at end of file
--- /dev/null
+../../../../common/x86_64/dmidecode
\ No newline at end of file
--- /dev/null
+../../../../common/x86_64/glibc
\ No newline at end of file
--- /dev/null
+../../../common/xz
\ No newline at end of file
--- /dev/null
+../../../common/zlib
\ No newline at end of file
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2023 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=184
+
+# 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
+
+# Stop services
+/etc/init.d/squid stop
+/etc/init.d/vnstat stop
+
+# Extract files
+extract_files
+
+# Remove dropped elfutils addon
+rm -vf \
+ /opt/pakfire/db/installed/meta-elfutils \
+ /opt/pakfire/db/meta/meta-elfutils \
+ /opt/pakfire/db/rootfiles/elfutils \
+ /usr/bin/eu-addr2line \
+ /usr/bin/eu-ar \
+ /usr/bin/eu-elfclassify \
+ /usr/bin/eu-elfcmp \
+ /usr/bin/eu-elfcompress \
+ /usr/bin/eu-elflint \
+ /usr/bin/eu-findtextrel \
+ /usr/bin/eu-make-debug-archive \
+ /usr/bin/eu-nm \
+ /usr/bin/eu-objdump \
+ /usr/bin/eu-ranlib \
+ /usr/bin/eu-readelf \
+ /usr/bin/eu-size \
+ /usr/bin/eu-srcfiles \
+ /usr/bin/eu-stack \
+ /usr/bin/eu-strings \
+ /usr/bin/eu-strip \
+ /usr/bin/eu-unstrip
+
+# Remove files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Start services
+telinit u
+/etc/init.d/vnstat start
+/etc/init.d/collectd restart
+/etc/init.d/suricata restart
+/etc/init.d/unbound restart
+if [ -f /var/ipfire/proxy/enable ]; then
+ /etc/init.d/squid start
+fi
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py
usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py
usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py
+usr/lib/python3.10/site-packages/borg/testsuite/hashindex_stress.py
usr/lib/python3.10/site-packages/borg/testsuite/helpers.py
usr/lib/python3.10/site-packages/borg/testsuite/item.py
usr/lib/python3.10/site-packages/borg/testsuite/key.py
usr/lib/python3.10/site-packages/borg/upgrader.py
usr/lib/python3.10/site-packages/borg/version.py
usr/lib/python3.10/site-packages/borg/xattr.py
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/not-zip-safe
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/borgbackup-1.2.3-py3.10.egg-info/top_level.txt
-
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/PKG-INFO
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/SOURCES.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/dependency_links.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/entry_points.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/not-zip-safe
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/requires.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.7-py3.10.egg-info/top_level.txt
#usr/include/libfreshclam.h
usr/lib/libclamav.so
usr/lib/libclamav.so.12
-usr/lib/libclamav.so.12.0.1
+usr/lib/libclamav.so.12.0.2
+#usr/lib/libclamav_rust.a
usr/lib/libclammspack.so
usr/lib/libclammspack.so.0
usr/lib/libclammspack.so.0.8.0
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.12
-usr/lib/libclamunrar.so.12.0.1
+usr/lib/libclamunrar.so.12.0.2
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.12
-usr/lib/libclamunrar_iface.so.12.0.1
+usr/lib/libclamunrar_iface.so.12.0.2
usr/lib/libfreshclam.so
usr/lib/libfreshclam.so.3
usr/lib/libfreshclam.so.3.0.1
#usr/share/doc/ClamAV/html/fonts/open-sans-v17-all-charsets-italic.woff2
#usr/share/doc/ClamAV/html/fonts/open-sans-v17-all-charsets-regular.woff2
#usr/share/doc/ClamAV/html/fonts/source-code-pro-v11-all-charsets-500.woff2
+#usr/share/doc/ClamAV/html/googled62299e9391332c4.html
#usr/share/doc/ClamAV/html/highlight.css
#usr/share/doc/ClamAV/html/highlight.js
#usr/share/doc/ClamAV/html/images
#usr/share/doc/ClamAV/html/searcher.js
#usr/share/doc/ClamAV/html/searchindex.js
#usr/share/doc/ClamAV/html/searchindex.json
+#usr/share/doc/ClamAV/html/sitemap.xml
#usr/share/doc/ClamAV/html/theme-dawn.js
#usr/share/doc/ClamAV/html/theme-tomorrow_night.js
#usr/share/doc/ClamAV/html/tomorrow-night.css
#usr/lib/cmake/fmt/fmt-targets.cmake
#usr/lib/libfmt.so
usr/lib/libfmt.so.10
-usr/lib/libfmt.so.10.0.0
+usr/lib/libfmt.so.10.2.1
#usr/lib/pkgconfig/fmt.pc
etc/rc.d/init.d/frr
usr/bin/vtysh
#usr/include/frr
+#usr/include/frr/admin_group.h
+#usr/include/frr/affinitymap.h
#usr/include/frr/agg_table.h
+#usr/include/frr/asn.h
#usr/include/frr/assert.h
#usr/include/frr/atomlist.h
#usr/include/frr/base64.h
#usr/include/frr/compiler.h
#usr/include/frr/cspf.h
#usr/include/frr/csv.h
+#usr/include/frr/darr.h
#usr/include/frr/db.h
#usr/include/frr/debug.h
#usr/include/frr/defaults.h
#usr/include/frr/eigrpd/eigrpd.h
#usr/include/frr/ferr.h
#usr/include/frr/filter.h
+#usr/include/frr/flex_algo.h
#usr/include/frr/freebsd-queue.h
#usr/include/frr/frr_pthread.h
#usr/include/frr/frratomic.h
#usr/include/frr/frrcu.h
+#usr/include/frr/frrevent.h
#usr/include/frr/frrlua.h
#usr/include/frr/frrscript.h
#usr/include/frr/frrstr.h
-#usr/include/frr/getopt.h
#usr/include/frr/graph.h
#usr/include/frr/hash.h
#usr/include/frr/hook.h
#usr/include/frr/if_rmap.h
#usr/include/frr/imsg.h
#usr/include/frr/ipaddr.h
+#usr/include/frr/iso.h
#usr/include/frr/jhash.h
#usr/include/frr/json.h
#usr/include/frr/keychain.h
#usr/include/frr/log_vty.h
#usr/include/frr/md5.h
#usr/include/frr/memory.h
+#usr/include/frr/mgmt.pb-c.h
+#usr/include/frr/mgmt_be_client.h
+#usr/include/frr/mgmt_fe_client.h
+#usr/include/frr/mgmt_msg.h
+#usr/include/frr/mgmt_pb.h
+#usr/include/frr/mgmtd
+#usr/include/frr/mgmtd/mgmt_defines.h
#usr/include/frr/mlag.h
#usr/include/frr/module.h
#usr/include/frr/monotime.h
#usr/include/frr/routemap.h
#usr/include/frr/routing_nb.h
#usr/include/frr/sbuf.h
+#usr/include/frr/segment_routing.h
#usr/include/frr/seqlock.h
#usr/include/frr/sha256.h
#usr/include/frr/sigevent.h
#usr/include/frr/table.h
#usr/include/frr/tc.h
#usr/include/frr/termtable.h
-#usr/include/frr/thread.h
#usr/include/frr/trace.h
#usr/include/frr/typerb.h
#usr/include/frr/typesafe.h
#usr/lib/libfrr.so
usr/lib/libfrr.so.0
usr/lib/libfrr.so.0.0.0
+#usr/lib/libfrr_pb.la
+#usr/lib/libfrr_pb.so
+usr/lib/libfrr_pb.so.0
+usr/lib/libfrr_pb.so.0.0.0
#usr/lib/libfrrcares.la
#usr/lib/libfrrcares.so
usr/lib/libfrrcares.so.0
usr/lib/libfrrcares.so.0.0.0
+#usr/lib/libmgmt_be_nb.la
+#usr/lib/libmgmt_be_nb.so
+usr/lib/libmgmt_be_nb.so.0
+usr/lib/libmgmt_be_nb.so.0.0.0
usr/sbin/bgpd
usr/sbin/fabricd
usr/sbin/frr
usr/sbin/frrcommon.sh
usr/sbin/frrinit.sh
usr/sbin/generate_support_bundle.py
+usr/sbin/mgmtd
usr/sbin/ospfd
usr/sbin/pathd
usr/sbin/pim6d
usr/sbin/watchfrr
usr/sbin/watchfrr.sh
usr/sbin/zebra
+#usr/share/yang/frr-affinity-map.yang
#usr/share/yang/frr-bgp-bmp.yang
#usr/share/yang/frr-bgp-common-multiprotocol.yang
#usr/share/yang/frr-bgp-common-structure.yang
#usr/share/yang/frr-bgp.yang
#usr/share/yang/frr-deviations-bgp-datacenter.yang
#usr/share/yang/frr-filter.yang
+#usr/share/yang/frr-if-rmap.yang
#usr/share/yang/frr-interface.yang
#usr/share/yang/frr-module-translator.yang
#usr/share/yang/frr-nexthop.yang
var/cache/gnump3d
var/cache/gnump3d/serving
var/log/gnump3d
+#var/mp3
var/mp3/info
#usr/include/mpd
+#usr/include/mpd/albumart.h
#usr/include/mpd/async.h
#usr/include/mpd/audio_format.h
+#usr/include/mpd/binary.h
#usr/include/mpd/capabilities.h
#usr/include/mpd/client.h
#usr/include/mpd/compiler.h
#usr/include/mpd/password.h
#usr/include/mpd/player.h
#usr/include/mpd/playlist.h
+#usr/include/mpd/position.h
#usr/include/mpd/protocol.h
#usr/include/mpd/queue.h
+#usr/include/mpd/readpicture.h
#usr/include/mpd/recv.h
#usr/include/mpd/replay_gain.h
#usr/include/mpd/response.h
#usr/include/mpd/version.h
usr/lib/libmpdclient.so
usr/lib/libmpdclient.so.2
-usr/lib/libmpdclient.so.2.19
+usr/lib/libmpdclient.so.2.22
#usr/lib/pkgconfig/libmpdclient.pc
#usr/share/doc/libmpdclient
#usr/share/doc/libmpdclient/AUTHORS
-#usr/share/doc/libmpdclient/COPYING
+#usr/share/doc/libmpdclient/BSD-2-Clause.txt
+#usr/share/doc/libmpdclient/BSD-3-Clause.txt
#usr/share/doc/libmpdclient/NEWS
#usr/share/doc/libmpdclient/README.rst
-#usr/share/vala
-#usr/share/vala/vapi
-#usr/share/vala/vapi/libmpdclient.vapi
#usr/include/talloc.h
#usr/lib/libtalloc.so
usr/lib/libtalloc.so.2
-usr/lib/libtalloc.so.2.3.4
+usr/lib/libtalloc.so.2.4.1
#usr/lib/pkgconfig/talloc.pc
#usr/lib/libvirt
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
-usr/lib/libvirt-admin.so.0.8010.0
+usr/lib/libvirt-admin.so.0.10000.0
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
-usr/lib/libvirt-lxc.so.0.8010.0
+usr/lib/libvirt-lxc.so.0.10000.0
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
-usr/lib/libvirt-qemu.so.0.8010.0
+usr/lib/libvirt-qemu.so.0.10000.0
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
-usr/lib/libvirt.so.0.8010.0
+usr/lib/libvirt.so.0.10000.0
#usr/lib/libvirt/connection-driver
usr/lib/libvirt/connection-driver/libvirt_driver_ch.so
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
#usr/share/doc/libvirt/examples/sh
#usr/share/doc/libvirt/examples/sh/virt-lxc-convert
#usr/share/doc/libvirt/examples/systemtap
+#usr/share/doc/libvirt/examples/systemtap/amd-sev-es-vmsa.stp
#usr/share/doc/libvirt/examples/systemtap/events.stp
#usr/share/doc/libvirt/examples/systemtap/lock-debug.stp
#usr/share/doc/libvirt/examples/systemtap/qemu-monitor.stp
usr/share/libvirt/cpu_map/x86_Conroe.xml
usr/share/libvirt/cpu_map/x86_Cooperlake.xml
usr/share/libvirt/cpu_map/x86_Dhyana.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Genoa.xml
usr/share/libvirt/cpu_map/x86_EPYC-IBPB.xml
usr/share/libvirt/cpu_map/x86_EPYC-Milan.xml
usr/share/libvirt/cpu_map/x86_EPYC-Rome.xml
usr/share/libvirt/cpu_map/x86_Penryn.xml
usr/share/libvirt/cpu_map/x86_SandyBridge-IBRS.xml
usr/share/libvirt/cpu_map/x86_SandyBridge.xml
+usr/share/libvirt/cpu_map/x86_SapphireRapids.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client-IBRS.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client.xml
#usr/share/locale/pl/LC_MESSAGES/libvirt.mo
#usr/share/locale/pt/LC_MESSAGES/libvirt.mo
#usr/share/locale/pt_BR/LC_MESSAGES/libvirt.mo
+#usr/share/locale/ro/LC_MESSAGES/libvirt.mo
#usr/share/locale/ru/LC_MESSAGES/libvirt.mo
#usr/share/locale/si/LC_MESSAGES/libvirt.mo
#usr/share/locale/sr/LC_MESSAGES/libvirt.mo
usr/sbin/lshw
+#usr/share/locale/ca/LC_MESSAGES/lshw.mo
+#usr/share/locale/es/LC_MESSAGES/lshw.mo
#usr/share/locale/fr/LC_MESSAGES/lshw.mo
#usr/share/lshw
#usr/share/lshw/manuf.txt
usr/libexec/mc/extfs.d/uwim
usr/libexec/mc/extfs.d/uzip
usr/libexec/mc/extfs.d/uzoo
-#usr/libexec/mc/fish
-#usr/libexec/mc/fish/README.fish
-usr/libexec/mc/fish/append
-usr/libexec/mc/fish/chmod
-usr/libexec/mc/fish/chown
-usr/libexec/mc/fish/fexists
-usr/libexec/mc/fish/get
-usr/libexec/mc/fish/hardlink
-usr/libexec/mc/fish/info
-usr/libexec/mc/fish/ln
-usr/libexec/mc/fish/ls
-usr/libexec/mc/fish/mkdir
-usr/libexec/mc/fish/mv
-usr/libexec/mc/fish/rmdir
-usr/libexec/mc/fish/send
-usr/libexec/mc/fish/unlink
-usr/libexec/mc/fish/utime
usr/libexec/mc/mc-wrapper.csh
usr/libexec/mc/mc-wrapper.sh
usr/libexec/mc/mc.csh
usr/libexec/mc/mc.sh
+#usr/libexec/mc/shell
+#usr/libexec/mc/shell/README.shell
+usr/libexec/mc/shell/append
+usr/libexec/mc/shell/chmod
+usr/libexec/mc/shell/chown
+usr/libexec/mc/shell/fexists
+usr/libexec/mc/shell/get
+usr/libexec/mc/shell/hardlink
+usr/libexec/mc/shell/info
+usr/libexec/mc/shell/ln
+usr/libexec/mc/shell/ls
+usr/libexec/mc/shell/mkdir
+usr/libexec/mc/shell/mv
+usr/libexec/mc/shell/rmdir
+usr/libexec/mc/shell/send
+usr/libexec/mc/shell/unlink
+usr/libexec/mc/shell/utime
#usr/share/man/man1/mc.1
#usr/share/man/man1/mcedit.1
#usr/share/man/man1/mcview.1
#usr/share/icons/hicolor/scalable/apps/mpd.svg
var/log/mpd.error.log
var/log/mpd.log
+var/ipfire/backup/addons/includes/mpd
+#var/ipfire/mpd
+#var/ipfire/mpd/db
+var/ipfire/mpd/db/info
+var/ipfire/mpd/mpd.conf
+var/ipfire/mpd/playlist.m3u
+var/mp3/info
var/ipfire/mpfire
var/ipfire/mpfire/bin
var/ipfire/mpfire/bin/mpfire.pl
-#var/ipfire/mpfire/db
-var/ipfire/mpfire/db/info
-var/ipfire/mpfire/mpd.conf
-var/ipfire/mpfire/playlist.m3u
var/ipfire/mpfire/settings
var/ipfire/mpfire/webradio
-var/mp3/info
usr/local/bin/mpfirectrl
srv/web/ipfire/cgi-bin/mpfire.cgi
srv/web/ipfire/html/images/mpfire
var/ipfire/menu.d/EX-mpfire.menu
-#var/mp3
--- /dev/null
+etc/rc.d/init.d/mympd
+usr/bin/mympd
+usr/bin/mympd-config
+usr/bin/mympd-script
+#usr/lib/systemd/system/mympd.service
+#usr/share/doc/mympd
+#usr/share/doc/mympd/CHANGELOG.md
+#usr/share/doc/mympd/LICENSE.md
+#usr/share/doc/mympd/README.md
+#usr/share/doc/mympd/SECURITY.md
+#usr/share/man/man1/mympd-config.1.gz
+#usr/share/man/man1/mympd-script.1.gz
+#usr/share/man/man1/mympd.1.gz
+var/ipfire/backup/addons/includes/mympd
+var/lib/mympd
+#var/lib/mympd/config
+#var/lib/mympd/config/http
+#var/lib/mympd/config/ssl_port
+#var/lib/mympd/state
+#var/lib/mympd/state/music_directory
+srv/web/ipfire/cgi-bin/mympd.cgi
+var/ipfire/menu.d/EX-mympd.menu
usr/lib/python3.10/site-packages/attr/_funcs.py
usr/lib/python3.10/site-packages/attr/_make.py
usr/lib/python3.10/site-packages/attr/_next_gen.py
+usr/lib/python3.10/site-packages/attr/_typing_compat.pyi
usr/lib/python3.10/site-packages/attr/_version_info.py
usr/lib/python3.10/site-packages/attr/_version_info.pyi
usr/lib/python3.10/site-packages/attr/converters.py
usr/lib/python3.10/site-packages/attr/validators.py
usr/lib/python3.10/site-packages/attr/validators.pyi
#usr/lib/python3.10/site-packages/attrs
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/attrs-22.1.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/licenses
+#usr/lib/python3.10/site-packages/attrs-23.2.0.dist-info/licenses/LICENSE
usr/lib/python3.10/site-packages/attrs/__init__.py
usr/lib/python3.10/site-packages/attrs/__init__.pyi
usr/lib/python3.10/site-packages/attrs/converters.py
usr/lib/python3.10/site-packages/exceptiongroup
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/INSTALLER
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/LICENSE
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/METADATA
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/RECORD
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/REQUESTED
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/WHEEL
-#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/direct_url.json
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/INSTALLER
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/LICENSE
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/METADATA
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/RECORD
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/REQUESTED
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/WHEEL
+#usr/lib/python3.10/site-packages/exceptiongroup-1.2.0.dist-info/direct_url.json
usr/lib/python3.10/site-packages/exceptiongroup/__init__.py
usr/lib/python3.10/site-packages/exceptiongroup/_catch.py
usr/lib/python3.10/site-packages/exceptiongroup/_exceptions.py
usr/lib/python3.10/site-packages/exceptiongroup/_formatting.py
+usr/lib/python3.10/site-packages/exceptiongroup/_suppress.py
usr/lib/python3.10/site-packages/exceptiongroup/_version.py
usr/lib/python3.10/site-packages/exceptiongroup/py.typed
usr/lib/python3.10/site-packages/msgpack
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/msgpack-1.0.4-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/msgpack/__init__.py
+usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpp
usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/msgpack/_cmsgpack.pyx
+usr/lib/python3.10/site-packages/msgpack/_packer.pyx
+usr/lib/python3.10/site-packages/msgpack/_unpacker.pyx
+#usr/lib/python3.10/site-packages/msgpack/buff_converter.h
usr/lib/python3.10/site-packages/msgpack/exceptions.py
usr/lib/python3.10/site-packages/msgpack/ext.py
usr/lib/python3.10/site-packages/msgpack/fallback.py
+#usr/lib/python3.10/site-packages/msgpack/pack.h
+#usr/lib/python3.10/site-packages/msgpack/pack_template.h
+#usr/lib/python3.10/site-packages/msgpack/sysdep.h
+#usr/lib/python3.10/site-packages/msgpack/unpack.h
+#usr/lib/python3.10/site-packages/msgpack/unpack_define.h
+#usr/lib/python3.10/site-packages/msgpack/unpack_template.h
usr/lib/python3.10/site-packages/packaging
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/packaging-23.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/packaging-23.2-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/packaging/__init__.py
usr/lib/python3.10/site-packages/packaging/_elffile.py
usr/lib/python3.10/site-packages/packaging/_manylinux.py
usr/lib/python3.10/site-packages/packaging/_structures.py
usr/lib/python3.10/site-packages/packaging/_tokenizer.py
usr/lib/python3.10/site-packages/packaging/markers.py
+usr/lib/python3.10/site-packages/packaging/metadata.py
usr/lib/python3.10/site-packages/packaging/py.typed
usr/lib/python3.10/site-packages/packaging/requirements.py
usr/lib/python3.10/site-packages/packaging/specifiers.py
usr/lib/python3.10/site-packages/_pyfuse3.py
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/pyfuse3-3.2.2-py3.10.egg-info/zip-safe
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/pyfuse3-3.3.0-py3.10.egg-info/zip-safe
usr/lib/python3.10/site-packages/pyfuse3.cpython-310-xxxMACHINExxx-linux-gnu.so
usr/lib/python3.10/site-packages/pyfuse3_asyncio.py
#usr/lib/python3.10/site-packages/trio
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/trio-0.22.0-py3.10.egg-info/top_level.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/trio-0.23.1-py3.10.egg-info/top_level.txt
usr/lib/python3.10/site-packages/trio/__init__.py
usr/lib/python3.10/site-packages/trio/_abc.py
usr/lib/python3.10/site-packages/trio/_channel.py
usr/lib/python3.10/site-packages/trio/_core/_multierror.py
usr/lib/python3.10/site-packages/trio/_core/_parking_lot.py
usr/lib/python3.10/site-packages/trio/_core/_run.py
+#usr/lib/python3.10/site-packages/trio/_core/_tests
+usr/lib/python3.10/site-packages/trio/_core/_tests/__init__.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_asyncgen.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_guest_mode.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_instrumentation.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_io.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_ki.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_local.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_mock_clock.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/__init__.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/_common.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/apport_excepthook.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_multierror_scripts/simple_excepthook.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_parking_lot.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_run.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_thread_cache.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_tutil.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_unbounded_queue.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/test_windows.py
+usr/lib/python3.10/site-packages/trio/_core/_tests/tutil.py
usr/lib/python3.10/site-packages/trio/_core/_thread_cache.py
usr/lib/python3.10/site-packages/trio/_core/_traps.py
usr/lib/python3.10/site-packages/trio/_core/_unbounded_queue.py
usr/lib/python3.10/site-packages/trio/_core/_wakeup_socketpair.py
usr/lib/python3.10/site-packages/trio/_core/_windows_cffi.py
-#usr/lib/python3.10/site-packages/trio/_core/tests
-usr/lib/python3.10/site-packages/trio/_core/tests/__init__.py
-usr/lib/python3.10/site-packages/trio/_core/tests/conftest.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_asyncgen.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_guest_mode.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_instrumentation.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_io.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_ki.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_local.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_mock_clock.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror.py
-#usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/__init__.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/_common.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/apport_excepthook.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/ipython_custom_exc.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/simple_excepthook.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_multierror_scripts/simple_excepthook_IPython.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_parking_lot.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_run.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_thread_cache.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_tutil.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_unbounded_queue.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_util.py
-usr/lib/python3.10/site-packages/trio/_core/tests/test_windows.py
-usr/lib/python3.10/site-packages/trio/_core/tests/tutil.py
usr/lib/python3.10/site-packages/trio/_deprecate.py
usr/lib/python3.10/site-packages/trio/_dtls.py
usr/lib/python3.10/site-packages/trio/_file_io.py
usr/lib/python3.10/site-packages/trio/_subprocess_platform/waitid.py
usr/lib/python3.10/site-packages/trio/_subprocess_platform/windows.py
usr/lib/python3.10/site-packages/trio/_sync.py
+#usr/lib/python3.10/site-packages/trio/_tests
+usr/lib/python3.10/site-packages/trio/_tests/__init__.py
+usr/lib/python3.10/site-packages/trio/_tests/check_type_completeness.py
+usr/lib/python3.10/site-packages/trio/_tests/module_with_deprecations.py
+usr/lib/python3.10/site-packages/trio/_tests/pytest_plugin.py
+usr/lib/python3.10/site-packages/trio/_tests/test_abc.py
+usr/lib/python3.10/site-packages/trio/_tests/test_channel.py
+usr/lib/python3.10/site-packages/trio/_tests/test_contextvars.py
+usr/lib/python3.10/site-packages/trio/_tests/test_deprecate.py
+usr/lib/python3.10/site-packages/trio/_tests/test_dtls.py
+usr/lib/python3.10/site-packages/trio/_tests/test_exports.py
+usr/lib/python3.10/site-packages/trio/_tests/test_fakenet.py
+usr/lib/python3.10/site-packages/trio/_tests/test_file_io.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_generic.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_open_tcp_listeners.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_open_tcp_stream.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_open_unix_stream.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_serve_listeners.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_socket.py
+usr/lib/python3.10/site-packages/trio/_tests/test_highlevel_ssl_helpers.py
+usr/lib/python3.10/site-packages/trio/_tests/test_path.py
+usr/lib/python3.10/site-packages/trio/_tests/test_scheduler_determinism.py
+usr/lib/python3.10/site-packages/trio/_tests/test_signals.py
+usr/lib/python3.10/site-packages/trio/_tests/test_socket.py
+usr/lib/python3.10/site-packages/trio/_tests/test_ssl.py
+usr/lib/python3.10/site-packages/trio/_tests/test_subprocess.py
+usr/lib/python3.10/site-packages/trio/_tests/test_sync.py
+usr/lib/python3.10/site-packages/trio/_tests/test_testing.py
+usr/lib/python3.10/site-packages/trio/_tests/test_threads.py
+usr/lib/python3.10/site-packages/trio/_tests/test_timeouts.py
+usr/lib/python3.10/site-packages/trio/_tests/test_tracing.py
+usr/lib/python3.10/site-packages/trio/_tests/test_unix_pipes.py
+usr/lib/python3.10/site-packages/trio/_tests/test_util.py
+usr/lib/python3.10/site-packages/trio/_tests/test_wait_for_object.py
+usr/lib/python3.10/site-packages/trio/_tests/test_windows_pipes.py
+#usr/lib/python3.10/site-packages/trio/_tests/tools
+usr/lib/python3.10/site-packages/trio/_tests/tools/__init__.py
+usr/lib/python3.10/site-packages/trio/_tests/tools/test_gen_exports.py
+usr/lib/python3.10/site-packages/trio/_tests/tools/test_mypy_annotate.py
usr/lib/python3.10/site-packages/trio/_threads.py
usr/lib/python3.10/site-packages/trio/_timeouts.py
#usr/lib/python3.10/site-packages/trio/_tools
usr/lib/python3.10/site-packages/trio/_tools/__init__.py
usr/lib/python3.10/site-packages/trio/_tools/gen_exports.py
+usr/lib/python3.10/site-packages/trio/_tools/mypy_annotate.py
usr/lib/python3.10/site-packages/trio/_unix_pipes.py
usr/lib/python3.10/site-packages/trio/_util.py
usr/lib/python3.10/site-packages/trio/_version.py
usr/lib/python3.10/site-packages/trio/abc.py
usr/lib/python3.10/site-packages/trio/from_thread.py
usr/lib/python3.10/site-packages/trio/lowlevel.py
+usr/lib/python3.10/site-packages/trio/py.typed
usr/lib/python3.10/site-packages/trio/socket.py
#usr/lib/python3.10/site-packages/trio/testing
usr/lib/python3.10/site-packages/trio/testing/__init__.py
usr/lib/python3.10/site-packages/trio/testing/_network.py
usr/lib/python3.10/site-packages/trio/testing/_sequencer.py
usr/lib/python3.10/site-packages/trio/testing/_trio_test.py
-#usr/lib/python3.10/site-packages/trio/tests
-usr/lib/python3.10/site-packages/trio/tests/__init__.py
-usr/lib/python3.10/site-packages/trio/tests/conftest.py
-usr/lib/python3.10/site-packages/trio/tests/module_with_deprecations.py
-usr/lib/python3.10/site-packages/trio/tests/test_abc.py
-usr/lib/python3.10/site-packages/trio/tests/test_channel.py
-usr/lib/python3.10/site-packages/trio/tests/test_contextvars.py
-usr/lib/python3.10/site-packages/trio/tests/test_deprecate.py
-usr/lib/python3.10/site-packages/trio/tests/test_dtls.py
-usr/lib/python3.10/site-packages/trio/tests/test_exports.py
-usr/lib/python3.10/site-packages/trio/tests/test_fakenet.py
-usr/lib/python3.10/site-packages/trio/tests/test_file_io.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_generic.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_open_tcp_listeners.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_open_tcp_stream.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_open_unix_stream.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_serve_listeners.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_socket.py
-usr/lib/python3.10/site-packages/trio/tests/test_highlevel_ssl_helpers.py
-usr/lib/python3.10/site-packages/trio/tests/test_path.py
-usr/lib/python3.10/site-packages/trio/tests/test_scheduler_determinism.py
-usr/lib/python3.10/site-packages/trio/tests/test_signals.py
-usr/lib/python3.10/site-packages/trio/tests/test_socket.py
-usr/lib/python3.10/site-packages/trio/tests/test_ssl.py
-usr/lib/python3.10/site-packages/trio/tests/test_subprocess.py
-usr/lib/python3.10/site-packages/trio/tests/test_sync.py
-usr/lib/python3.10/site-packages/trio/tests/test_testing.py
-usr/lib/python3.10/site-packages/trio/tests/test_threads.py
-usr/lib/python3.10/site-packages/trio/tests/test_timeouts.py
-usr/lib/python3.10/site-packages/trio/tests/test_unix_pipes.py
-usr/lib/python3.10/site-packages/trio/tests/test_util.py
-usr/lib/python3.10/site-packages/trio/tests/test_wait_for_object.py
-usr/lib/python3.10/site-packages/trio/tests/test_windows_pipes.py
-#usr/lib/python3.10/site-packages/trio/tests/tools
-usr/lib/python3.10/site-packages/trio/tests/tools/__init__.py
-usr/lib/python3.10/site-packages/trio/tests/tools/test_gen_exports.py
+usr/lib/python3.10/site-packages/trio/tests.py
usr/lib/python3.10/site-packages/trio/to_thread.py
#usr/lib/libvirt
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
-usr/lib/libvirt-admin.so.0.8010.0
+usr/lib/libvirt-admin.so.0.10000.0
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
-usr/lib/libvirt-lxc.so.0.8010.0
+usr/lib/libvirt-lxc.so.0.10000.0
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
-usr/lib/libvirt-qemu.so.0.8010.0
+usr/lib/libvirt-qemu.so.0.10000.0
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
-usr/lib/libvirt.so.0.8010.0
+usr/lib/libvirt.so.0.10000.0
#usr/lib/libvirt/connection-driver
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.so
#usr/share/doc/libvirt/examples/sh
#usr/share/doc/libvirt/examples/sh/virt-lxc-convert
#usr/share/doc/libvirt/examples/systemtap
+#usr/share/doc/libvirt/examples/systemtap/amd-sev-es-vmsa.stp
#usr/share/doc/libvirt/examples/systemtap/events.stp
#usr/share/doc/libvirt/examples/systemtap/lock-debug.stp
#usr/share/doc/libvirt/examples/systemtap/qemu-monitor.stp
usr/share/libvirt/cpu_map/x86_Conroe.xml
usr/share/libvirt/cpu_map/x86_Cooperlake.xml
usr/share/libvirt/cpu_map/x86_Dhyana.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Genoa.xml
usr/share/libvirt/cpu_map/x86_EPYC-IBPB.xml
usr/share/libvirt/cpu_map/x86_EPYC-Milan.xml
usr/share/libvirt/cpu_map/x86_EPYC-Rome.xml
usr/share/libvirt/cpu_map/x86_Penryn.xml
usr/share/libvirt/cpu_map/x86_SandyBridge-IBRS.xml
usr/share/libvirt/cpu_map/x86_SandyBridge.xml
+usr/share/libvirt/cpu_map/x86_SapphireRapids.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client-IBRS.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client.xml
#usr/share/locale/pl/LC_MESSAGES/libvirt.mo
#usr/share/locale/pt/LC_MESSAGES/libvirt.mo
#usr/share/locale/pt_BR/LC_MESSAGES/libvirt.mo
+#usr/share/locale/ro/LC_MESSAGES/libvirt.mo
#usr/share/locale/ru/LC_MESSAGES/libvirt.mo
#usr/share/locale/si/LC_MESSAGES/libvirt.mo
#usr/share/locale/sr/LC_MESSAGES/libvirt.mo
#usr/share/transmission/public_html/images/favicon.png
#usr/share/transmission/public_html/images/webclip-icon.png
#usr/share/transmission/public_html/index.html
+#usr/share/transmission/public_html/transmission-app.css
#usr/share/transmission/public_html/transmission-app.js
-#usr/share/transmission/public_html/transmission-app.js.LICENSE.txt
+#usr/share/transmission/public_html/transmission-app.js.LEGAL.txt
var/ipfire/backup/addons/includes/transmission
+srv/web/ipfire/cgi-bin/transmission.cgi
+var/ipfire/menu.d/EX-transmission.menu
var/cache/vdr
var/ipfire/backup/addons/includes/vdr
#var/video
+srv/web/ipfire/cgi-bin/vdr.cgi
+var/ipfire/menu.d/EX-vdr.menu
etc/sysconfig/vdr-plugins.d/dvbapi.conf
etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.4.7
+usr/lib/vdr/libvdr-dvbapi.so.2.6.6
etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.4.7
+usr/lib/vdr/libvdr-eepg.so.2.6.6
etc/vdr/plugins/epgsearch
etc/vdr/plugins/epgsearch/conf.d
usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.7
-usr/lib/vdr/libvdr-epgsearch.so.2.4.7
-usr/lib/vdr/libvdr-epgsearchonly.so.2.4.7
-usr/lib/vdr/libvdr-quickepgsearch.so.2.4.7
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.6.6
+usr/lib/vdr/libvdr-epgsearch.so.2.6.6
+usr/lib/vdr/libvdr-epgsearchonly.so.2.6.6
+usr/lib/vdr/libvdr-quickepgsearch.so.2.6.6
#var/lib/vdr
#var/lib/vdr/data
var/lib/vdr/data/epgsearch
etc/vdr/plugins/streamdev-server/streamdevhosts.conf
#usr/lib/vdr/bin
usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.4.7
+usr/lib/vdr/libvdr-streamdev-server.so.2.6.6
preserve = no
policy = policy_match
email_in_dn = no
+copy_extensions = copyall
[ policy_match ]
countryName = optional
dl_type => "plain",
},
- # Positive Technologies Attack Detection Team rules.
- attack_detection => {
- summary => "PT Attack Detection Team Rules",
- website => "https://github.com/ptresearch/AttackDetection",
- tr_string => "attack detection team rules",
+ # ThreatFox
+ threatfox => {
+ summary => "ThreatFox Indicators Of Compromise Rules",
+ website => "https://threatfox.abuse.ch/",
+ tr_string => "threatfox rules",
requires_subscription => "False",
- dl_url => "https://raw.githubusercontent.com/ptresearch/AttackDetection/master/pt.rules.tar.gz",
- dl_type => "archive",
- },
-
- # Secureworks Security rules.
- secureworks_security => {
- summary => "Secureworks Security Ruleset",
- website => "https://www.secureworks.com",
- tr_string => "secureworks security ruleset",
- requires_subscription => "True",
- dl_url => "https://ws.secureworks.com/ti/ruleset/<subscription_code>/Suricata_suricata-security_latest.tgz",
- dl_type => "archive",
- },
-
- # Secureworks Malware rules.
- secureworks_malware => {
- summary => "Secureworks Malware Ruleset",
- website => "https://www.secureworks.com",
- tr_string => "secureworks malware ruleset",
- requires_subscription => "True",
- dl_url => "https://ws.secureworks.com/ti/ruleset/<subscription_code>/Suricata_suricata-malware_latest.tgz",
- dl_type => "archive",
- },
-
- # Secureworks Enhanced rules.
- secureworks_enhanced => {
- summary => "Secureworks Enhanced Ruleset",
- website => "https://www.secureworks.com",
- tr_string => "secureworks enhanced ruleset",
- requires_subscription => "True",
- dl_url => "https://ws.secureworks.com/ti/ruleset/<subscription_code>/Suricata_suricata-enhanced_latest.tgz",
- dl_type => "archive",
+ dl_url => "https://threatfox.abuse.ch/downloads/threatfox_suricata.rules",
+ dl_type => "plain",
},
# Travis B. Green hunting rules.
WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
WARNING: translation string unused: host deny
+WARNING: translation string unused: hostile networks
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint
WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: optional = Optional
WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: required = Required
WARNING: untranslated string: host certificate = Host Certificate
WARNING: untranslated string: host ip = Host IP address
WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior)
-WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: hostname = Hostname
WARNING: untranslated string: hostname cant be empty = Hostname cannot be empty.
WARNING: untranslated string: hostname not set = Hostname not set.
WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
WARNING: untranslated string: log = Log
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
WARNING: untranslated string: log lines per page = Lines per page
WARNING: untranslated string: log server address = Syslog server:
WARNING: untranslated string: references = References
WARNING: untranslated string: refresh = Refresh
WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
WARNING: translation string unused: host deny
+WARNING: translation string unused: hostile networks
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: info messages = unknown string
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: openvpn cert expires soon = Expires Soon
WARNING: untranslated string: openvpn cert has expired = Expired
WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: route config changed = unknown string
WARNING: translation string unused: host allow
WARNING: translation string unused: host configuration
WARNING: translation string unused: host deny
+WARNING: translation string unused: hostile networks
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: zoneconf val vlan tag range error
WARNING: translation string unused: zoneconf val zoneslave amount error
WARNING: untranslated string: core notice 3 = available.
-WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling
WARNING: untranslated string: enable disable client = unknown string
WARNING: untranslated string: enable disable dyndns = unknown string
WARNING: untranslated string: error message = unknown string
WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string
-WARNING: untranslated string: extrahd mounted = Mounted
-WARNING: untranslated string: extrahd no mount point given = No mount point given
-WARNING: untranslated string: extrahd not configured = Not configured
-WARNING: untranslated string: extrahd not mounted = Not mounted
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
WARNING: untranslated string: guardian logtarget_syslog = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: pakfire ago = ago.
-WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
-WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
-WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
-WARNING: untranslated string: spec rstack overflow = Speculative Return Stack Overflow
WARNING: untranslated string: wio = unknown string
WARNING: untranslated string: wio checked = unknown string
WARNING: untranslated string: wio cron = unknown string
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
-WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids add provider = Add provider
WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
WARNING: untranslated string: ids apply = Apply
WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
WARNING: untranslated string: log server protocol = protocol:
WARNING: untranslated string: masquerade blue = Masquerade BLUE
WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’
WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
WARNING: untranslated string: received = Received
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
-WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids add provider = Add provider
WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
WARNING: untranslated string: ids apply = Apply
WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
WARNING: untranslated string: log server protocol = protocol:
WARNING: untranslated string: masquerade blue = Masquerade BLUE
WARNING: untranslated string: rdns = rDNS
WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
WARNING: untranslated string: received = Received
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: required = Required
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
-WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids add provider = Add provider
WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
WARNING: untranslated string: ids apply = Apply
WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
WARNING: untranslated string: log server protocol = protocol:
WARNING: untranslated string: mac filter = MAC filter
WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
-WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids add provider = Add provider
WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
WARNING: untranslated string: ids apply = Apply
WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
WARNING: untranslated string: log server protocol = protocol:
WARNING: untranslated string: mac filter = MAC filter
WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
WARNING: untranslated string: received = Received
WARNING: untranslated string: red1 = RED
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
-WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: hostile networks in = From Hostile Networks
+WARNING: untranslated string: hostile networks out = To Hostile Networks
+WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids add provider = Add provider
WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
WARNING: untranslated string: ids apply = Apply
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: local ip address = Local IP Address
+WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
+WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
WARNING: untranslated string: meltdown = Meltdown
WARNING: untranslated string: mitigated = Mitigated
WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’
WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
WARNING: untranslated string: received = Received
+WARNING: untranslated string: regenerate host certificate = Renew Host Certificate
WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.
WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.
WARNING: untranslated string: release = Release
< extrahd because it it outside the allowed mount path
< g.dtm
< g.lite
+< hostile networks in
+< hostile networks out
+< hostile networks total
< ids automatic rules update
< ids subscription code required
< insert removable device
< ipsec invalid ip address or fqdn for rw endpoint
< ipsec roadwarrior endpoint
< link-layer encapsulation
+< log drop hostile in
+< log drop hostile out
< netbios nameserver daemon
< no entries
< notes
< optional
< quick control
< random number generator daemon
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< required
< extrahd not configured
< extrahd not mounted
< hardware vulnerabilities
+< hostile networks in
+< hostile networks out
+< hostile networks total
< invalid ip or hostname
+< log drop hostile in
+< log drop hostile out
< openvpn cert expires soon
< openvpn cert has expired
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< service boot setting unavailable
< ansi t1.483
< bewan adsl pci st
< bewan adsl usb
-< downfall gather data sampling
< extrahd because it it outside the allowed mount path
-< extrahd mounted
-< extrahd no mount point given
-< extrahd not configured
-< extrahd not mounted
< g.dtm
< g.lite
-< reiserfs warning1
-< reiserfs warning2
-< spec rstack overflow
+< hostile networks total
< upload fcdsl.o
############################################################################
# Checking cgi-bin translations for language: it #
< guaranteed bandwidth
< guardian
< hardware vulnerabilities
-< hostile networks
+< hostile networks in
+< hostile networks out
+< hostile networks total
< ids add provider
< ids adjust ruleset
< ids apply
< locationblock country name
< locationblock enable feature
< locationblock flag
+< log drop hostile in
+< log drop hostile out
< log dropped conntrack invalids
< log server protocol
< masquerade blue
< reboot fsck
< rebooting ipfire fsck
< received
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< release
< generate ptr
< guardian
< hardware vulnerabilities
-< hostile networks
+< hostile networks in
+< hostile networks out
+< hostile networks total
< ids add provider
< ids adjust ruleset
< ids apply
< locationblock country name
< locationblock enable feature
< locationblock flag
+< log drop hostile in
+< log drop hostile out
< log dropped conntrack invalids
< log server protocol
< masquerade blue
< rdns
< rebooting ipfire fsck
< received
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< required
< grouptype
< guardian
< hardware vulnerabilities
-< hostile networks
+< hostile networks in
+< hostile networks out
+< hostile networks total
< ids add provider
< ids adjust ruleset
< ids apply
< locationblock country name
< locationblock enable feature
< locationblock flag
+< log drop hostile in
+< log drop hostile out
< log dropped conntrack invalids
< log server protocol
< mac filter
< rebooting ipfire fsck
< received
< red1
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< release
< grouptype
< guardian
< hardware vulnerabilities
-< hostile networks
+< hostile networks in
+< hostile networks out
+< hostile networks total
< hour-graph
< ids add provider
< ids adjust ruleset
< locationblock country name
< locationblock enable feature
< locationblock flag
+< log drop hostile in
+< log drop hostile out
< log dropped conntrack invalids
< log server protocol
< mac filter
< rebooting ipfire fsck
< received
< red1
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< release
< fw red
< generate ptr
< hardware vulnerabilities
-< hostile networks
+< hostile networks in
+< hostile networks out
+< hostile networks total
< ids add provider
< ids adjust ruleset
< ids apply
< legacy architecture warning
< link-layer encapsulation
< local ip address
+< log drop hostile in
+< log drop hostile out
< log dropped conntrack invalids
< meltdown
< mitigated
< reboot fsck
< rebooting ipfire fsck
< received
+< regenerate host certificate
< reiserfs warning1
< reiserfs warning2
< release
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
my %color = ();
#Basic syntax allowed for new Option definition. Not implemented: RECORDS & array of RECORDS
-our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address';
+our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of (ip-address|integer (8|16|32))';
&Header::showhttpheaders();
our @ITFs=('GREEN');
# Go further if there was no error.
if ( ! $errormessage) {
- # Check if a remark has been entered.
- $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
my %dns_servers = ();
my $id;
<!-- Table of networks -->
<table class='tbl' style='width:80%;'>
<tr>
- <th style='background-color:$color{'color20'};'>$Lang::tr{'network'}</th>
- <th style='background-color:$color{'color20'};'>$Lang::tr{'ip address'}</th>
- <th style='background-color:$color{'color20'};'>$Lang::tr{'status'}</th>
+ <th>$Lang::tr{'network'}</th>
+ <th>$Lang::tr{'ip address'}</th>
+ <th>$Lang::tr{'status'}</th>
</tr>
<tr>
<td style='width:25%; text-align:center; background-color:$Header::colourred;'><a href='/cgi-bin/pppsetup.cgi' style='color:white;'><b>$Lang::tr{'internet'}</b></a><br/></td>
delete $mpfiresettings{'PAGE'}; delete $mpfiresettings{'FRAME'};
&General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings);
- open(DATEI, "<${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden";
+ open(DATEI, "<${General::swroot}/mpd/mpd.conf") || die "Datei nicht gefunden";
my @Zeilen = <DATEI>;
close(DATEI);
- open(DATEI, ">${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden";
+ open(DATEI, ">${General::swroot}/mpd/mpd.conf") || die "Datei nicht gefunden";
foreach (@Zeilen){
if ( $_ =~ /music_directory/){
print DATEI "music_directory \"".$mpfiresettings{'MUSICDIR'}."\"\n";
--- /dev/null
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 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/>. #
+# #
+###############################################################################
+
+print "Status: 302 Moved Temporarily\n";
+print "Location: https://$ENV{SERVER_ADDR}:8800\n\n";
+
+exit (0);
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
if (!$settings{'DROPHOSTILE'}) {
$settings{'DROPHOSTILE'} = 'off';
}
+if (!$settings{'LOGDROPHOSTILEIN'}) {
+ $settings{'LOGDROPHOSTILEIN'} = 'on';
+}
+if (!$settings{'LOGDROPHOSTILEOUT'}) {
+ $settings{'LOGDROPHOSTILEOUT'} = 'on';
+}
if (!$settings{'LOGDROPCTINVALID'}) {
$settings{'LOGDROPCTINVALID'} = 'on';
}
$checked{'DROPHOSTILE'}{'off'} = '';
$checked{'DROPHOSTILE'}{'on'} = '';
$checked{'DROPHOSTILE'}{$settings{'DROPHOSTILE'}} = "checked='checked'";
+$checked{'LOGDROPHOSTILEIN'}{'off'} = '';
+$checked{'LOGDROPHOSTILEIN'}{'on'} = '';
+$checked{'LOGDROPHOSTILEIN'}{$settings{'LOGDROPHOSTILEIN'}} = "checked='checked'";
+$checked{'LOGDROPHOSTILEOUT'}{'off'} = '';
+$checked{'LOGDROPHOSTILEOUT'}{'on'} = '';
+$checked{'LOGDROPHOSTILEOUT'}{$settings{'LOGDROPHOSTILEOUT'}} = "checked='checked'";
$checked{'LOGDROPCTINVALID'}{'off'} = '';
$checked{'LOGDROPCTINVALID'}{'on'} = '';
$checked{'LOGDROPCTINVALID'}{$settings{'LOGDROPCTINVALID'}} = "checked='checked'";
<br>
+<table width='95%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'fw red'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>$Lang::tr{'drop hostile'}</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='DROPHOSTILE' value='on' $checked{'DROPHOSTILE'}{'on'} />/
+ <input type='radio' name='DROPHOSTILE' value='off' $checked{'DROPHOSTILE'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
+</table>
+<br>
+
+<table width='95%' cellspacing='0'>
+<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr>
+<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/
+ <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr>
+<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/
+ <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr>
+</table>
+<br>
+
<table width='95%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td>
<input type='radio' name='DROPSPOOFEDMARTIAN' value='off' $checked{'DROPSPOOFEDMARTIAN'}{'off'} /> $Lang::tr{'off'}
</td>
</tr>
-</table>
-<br/>
-
-<table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'>
- <td colspan='2' align='left'><b>$Lang::tr{'fw red'}</b></td>
+ <tr>
+ <td align='left' width='60%'>$Lang::tr{'log drop hostile in'}</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='LOGDROPHOSTILEIN' value='on' $checked{'LOGDROPHOSTILEIN'}{'on'} />/
+ <input type='radio' name='LOGDROPHOSTILEIN' value='off' $checked{'LOGDROPHOSTILEIN'}{'off'} /> $Lang::tr{'off'}
+ </td>
</tr>
<tr>
- <td align='left' width='60%'>$Lang::tr{'drop hostile'}</td>
+ <td align='left' width='60%'>$Lang::tr{'log drop hostile out'}</td>
<td align='left'>
- $Lang::tr{'on'} <input type='radio' name='DROPHOSTILE' value='on' $checked{'DROPHOSTILE'}{'on'} />/
- <input type='radio' name='DROPHOSTILE' value='off' $checked{'DROPHOSTILE'}{'off'} /> $Lang::tr{'off'}
+ $Lang::tr{'on'} <input type='radio' name='LOGDROPHOSTILEOUT' value='on' $checked{'LOGDROPHOSTILEOUT'}{'on'} />/
+ <input type='radio' name='LOGDROPHOSTILEOUT' value='off' $checked{'LOGDROPHOSTILEOUT'}{'off'} /> $Lang::tr{'off'}
</td>
</tr>
</table>
-<br>
+<br/>
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr>
-<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/
- <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr>
-<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/
- <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr>
-</table>
-<br>
<table width='95%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw settings'}</b></td></tr>
<tr><td align='left' width='60%'>$Lang::tr{'fw settings color'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='SHOWCOLORS' value='on' $checked{'SHOWCOLORS'}{'on'} />/
}
}
- # Check for RW if client name is already set
- if ($cgiparams{'TYPE'} eq 'host') {
- foreach my $key (keys %confighash) {
- if ($confighash{$key}[1] eq $cgiparams{'NAME'}) {
- $errormessage = $Lang::tr{'a connection with this name already exists'};
- goto VPNCONF_ERROR;
- }
- }
- }
+ # Check for RW if client name is already set
+ if ($cgiparams{'TYPE'} eq 'host') {
+ foreach my $key (keys %confighash) {
+ if ($confighash{$key}[1] eq $cgiparams{'NAME'}) {
+ $errormessage = $Lang::tr{'a connection with this name already exists'};
+ goto VPNCONF_ERROR;
+ }
+ }
+ }
+
+ # Check if there is no other entry with this common name
+ if ((! $cgiparams{'KEY'}) && ($cgiparams{'AUTH'} ne 'psk')) {
+ foreach my $key (keys %confighash) {
+ if ($confighash{$key}[2] eq $cgiparams{'CERT_NAME'}) {
+ $errormessage = $Lang::tr{'a connection with this common name already exists'};
+ goto VPNCONF_ERROR;
+ }
+ }
+ }
# Replace empty strings with a .
(my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/\./;
goto VPNCONF_ERROR;
}
- # Check if there is no other entry with this common name
- if ((! $cgiparams{'KEY'}) && ($cgiparams{'AUTH'} ne 'psk')) {
- foreach my $key (keys %confighash) {
- if ($confighash{$key}[2] eq $cgiparams{'CERT_NAME'}) {
- $errormessage = $Lang::tr{'a connection with this common name already exists'};
- goto VPNCONF_ERROR;
- }
- }
- }
-
# Save the config
my $key = $cgiparams{'KEY'};
--- /dev/null
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 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/>. #
+# #
+###############################################################################
+
+print "Status: 302 Moved Temporarily\n";
+print "Location: http://$ENV{SERVER_ADDR}:9091\n\n";
+
+exit (0);
--- /dev/null
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 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/>. #
+# #
+###############################################################################
+
+print "Status: 302 Moved Temporarily\n";
+print "Location: http://$ENV{SERVER_ADDR}:3000\n\n";
+
+exit (0);
my $opt = shift;
my $retssl = `/usr/bin/openssl $opt 2>&1`; #redirect stderr
my $ret = '';
- foreach my $line (split (/\n/, $retssl)) {
- &General::log("ipsec", "$line") if (0); # 1 for verbose logging
- $ret .= '<br>'.$line if ( $line =~ /error|unknown/ );
- }
- if ($ret) {
- $ret= &Header::cleanhtml($ret);
+
+ if ($?) {
+ foreach my $line (split (/\n/, $retssl)) {
+ &General::log("ipsec", "$line") if (0); # 1 for verbose logging
+ $ret .= '<br>' . &Header::escape($line);
+ }
}
+
return $ret ? "$Lang::tr{'openssl produced an error'}: $ret" : '' ;
}
###
sub getCNfromcert ($) {
#&General::log("ipsec", "Extracting name from $_[0]...");
my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
- $temp =~ /Subject:.*CN = (.*)[\n]/;
+ $temp =~ /Subject:.*CN\s*=\s*(.*)[\n]/;
$temp = $1;
$temp =~ s+/Email+, E+;
$temp =~ s/ ST = / S = /;
exit(0);
}
###
+### Regenerate the host certificate
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'regenerate host certificate'}) {
+ $errormessage = ®enerate_host_certificate();
+
+###
### Form for generating/importing the caroot+host certificate
###
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate root/host certificates'} ||
&General::log("ipsec", "Creating a cert...");
if (open(STDIN, "-|")) {
- my $opt = " req -nodes -rand /proc/interrupts:/proc/net/rt_cache";
+ my $opt = " req -nodes";
$opt .= " -newkey rsa:4096";
$opt .= " -keyout ${General::swroot}/certs/$cgiparams{'NAME'}key.pem";
$opt .= " -out ${General::swroot}/certs/$cgiparams{'NAME'}req.pem";
<input type='hidden' name='ACTION' value="$Lang::tr{'download host certificate'}" />
</form>
</td>
- <td width='4%' $col2> </td></tr>
+ <td width='4%' align='center' $col2>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='image' name='$Lang::tr{'regenerate host certificate'}' src='/images/reload.gif' alt='$Lang::tr{'regenerate host certificate'}' title='$Lang::tr{'regenerate host certificate'}' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'regenerate host certificate'}' />
+ </form>
+ </td></tr>
END
;
} else {
return join(",", @cidr_nets);
}
+
+sub regenerate_host_certificate() {
+ my $errormessage = "";
+
+ &General::log("ipsec", "Regenerating host certificate...");
+
+ # Create a CSR based on the existing certificate
+ my $opt = " x509 -x509toreq -copy_extensions copyall";
+ $opt .= " -signkey ${General::swroot}/certs/hostkey.pem";
+ $opt .= " -in ${General::swroot}/certs/hostcert.pem";
+ $opt .= " -out ${General::swroot}/certs/hostreq.pem";
+ $errormessage = &callssl($opt);
+
+ # Revoke the old certificate
+ if (!$errormessage) {
+ &General::log("ipsec", "Revoking the old host cert...");
+
+ my $opt = " ca -revoke ${General::swroot}/certs/hostcert.pem";
+ $errormessage = &callssl($opt);
+ }
+
+ # Sign the host certificate request
+ if (!$errormessage) {
+ &General::log("ipsec", "Self signing host cert...");
+
+ my $opt = " ca -md sha256 -days 825";
+ $opt .= " -batch -notext";
+ $opt .= " -in ${General::swroot}/certs/hostreq.pem";
+ $opt .= " -out ${General::swroot}/certs/hostcert.pem";
+ $errormessage = &callssl ($opt);
+
+ unlink ("${General::swroot}/certs/hostreq.pem"); #no more needed
+ }
+
+ # Reload the new certificate
+ if (!$errormessage) {
+ &General::system('/usr/local/bin/ipsecctrl', 'R');
+ }
+
+ return $errormessage;
+}
width: 960px !important;
}
+/* Fonts */
+
+@font-face {
+ font-family: "Prompt";
+ font-style: normal;
+ font-weight: 400;
+ src: local("Prompt Regular"), local("Prompt-Regular"), url(../fonts/Prompt-Regular.ttf) format("truetype");
+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+@font-face {
+ font-family: "Prompt";
+ font-style: normal;
+ font-weight: 400;
+ src: local("Prompt Regular"), local("Prompt-Regular"), url(../fonts/Prompt-Regular.ttf) format("truetype");
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+ font-family: 'Prompt';
+ font-style: normal;
+ font-weight: 500;
+ src: local("Prompt Medium"), local("Prompt-Medium"), url(../fonts/Prompt-Medium.ttf) format("truetype");
+ unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+@font-face {
+ font-family: 'Prompt';
+ font-style: normal;
+ font-weight: 500;
+ src: local("Prompt Medium"), local("Prompt-Medium"), url(../fonts/Prompt-Medium.ttf) format("truetype");
+ unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+ font-family: "Prompt";
+ font-style: normal;
+ font-weight: 700;
+ src: local("Prompt Bold"), local("Prompt-Bold"), url(../fonts/Prompt-Bold.ttf) format("truetype");
+ unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+@font-face {
+ font-family: "Prompt";
+ font-style: normal;
+ font-weight: 700;
+ src: local("Prompt Bold"), local("Prompt-Bold"), url(../fonts/Prompt-Bold.ttf) format("truetype");
+ unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
/* Basic Stuff */
* {
margin: 0;
- padding: 0;
}
html {
- height: 100%;
+ height: 100vh;
}
body {
- /* SVG as background image (IE9/Chrome/Safari/Opera) */
- background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2ODQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMTAwJSIgeTE9IjEwMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODgwNDAwIiBvZmZzZXQ9IjU3JSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2c2ODQpIiAvPgo8L3N2Zz4=);
-
- background-image: linear-gradient(
- bottom,
- #000000 0%,
- #880400 57%
- );
- background-image: -o-linear-gradient(
- bottom,
- #000000 0%,
- #880400 57%
- );
- background-image: -moz-linear-gradient(
- bottom,
- #000000 0%,
- #880400 57%
- );
- background-image: -webkit-linear-gradient(
- bottom,
- #000000 0%,
- #880400 57
- );
- background-image: -ms-linear-gradient(
- bottom,
- #000000 0%,
- #880400 57%
- );
- background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0, #000000),
- color-stop(0.57, #880400)
+ background: linear-gradient(
+ #ff2e52,
+ #000000
);
background-attachment: fixed;
+ font-family: "Prompt", sans-serif;
font-size: 9pt;
- font-family: "DejaVu Sans", Helvetica, sans-serif;
-}
+ color: #363636;
+}
h1, h2, h3, h4, h5, h6 {
font-size: 20px;
text-align: left;
}
-h1 {
- color: #66000F;
-}
-
br.clear {
clear: both;
}
a {
text-decoration: underline;
- color: #d90000;
+ color: #ff2e52;
}
a:hover {
/* Header */
#header {
- height: 70px;
margin: 0 auto;
}
}
#logo h1 {
- color: #fff;
- font-size: 3.6em;
+ color: #ffffff;
+ font-size: 3.5em;
font-weight: bold;
- padding-top: 0.2em;
- padding-left: 1.7em;
+}
+
+#logo h1 a {
+ color: inherit;
+ text-decoration: none;
}
/* Main */
margin: 0 auto;
margin-top: 0.5em;
padding: 1.5em 2em 0 2em;
- background: #fff url('../../images/n2.gif') 0px 0px repeat-x;
- border: 1px solid black;
+ background: #ffffff;
+ border: 2px solid black;
border-radius: 3px 3px 3px 3px;
- -webkit-border-radius: 3px 3px 3px 3px;
}
#main_inner {
#footer {
height: 2.5em;
- margin-bottom: 1em;
+ margin-bottom: 1.5em;
+ padding-bottom: 0.5em;
}
#footer a {
text-decoration: underline;
}
-input {
- margin: 0.2em;
-}
-
-input.button {
- background: #ca2f2f url('../../images/n3.gif') repeat-x;
- color: #fff;
- border: solid 1px #a94b4b;
- font-weight: bold;
- font-size: 0.8em;
- height: 2.0em;
-}
-
-input.text {
- border: solid 1px #f1f1f1;
- padding: 0.25em;
-}
-
#traffic {
float: right;
min-width: 20em;
/* Menu */
#cssmenu {
- margin: 0 auto;
- margin-top: 0;
padding-top: 0;
- font-weight: 600;
+ font-weight: 500;
height: 32px;
- border: 1px solid black;
}
#cssmenu a {
- color: #111111;
+ color: #363636;
display: inline-block;
line-height: 32px;
padding: 0 1em;
#cssmenu ul {
list-style: none;
+ padding: 0;
}
#cssmenu > ul > li {
}
#cssmenu > ul > li.active a, #cssmenu > ul > li:hover > a {
- color: white;
- background: #aaaaaa;
+ color: #ffffff;
+ background: #363636;
}
#cssmenu .has-sub:hover > ul {
#cssmenu .has-sub ul li a {
min-width: 12em;
background: #ffffff;
- color: grey;
+ color: #363636;
display: block;
line-height: 40%;
padding: 12px 5px;
}
#cssmenu .has-sub ul li:hover a {
- background: #dddddd;
+ color: #ffffff;
+ background: #363636;
}
/* This decorates all tables with class="tbl" */
}
.tbl th {
- color: #000000;
- border-top: 1px solid lightgrey;
- border-bottom: 1px solid lightgrey;
- background: #cccccc;
+ color: #ffffff;
+ border-top: 1px solid #363636;
+ border-bottom: 1px solid #363636;
+ background: #363636;
padding-left: 0.5em;
padding-right: 0.5em;
}
.tbl th:first-child {
- border-left: 1px solid lightgrey;
- border-top: 1px solid lightgrey;
- border-bottom: 1px solid lightgrey;
+ border-left: 1px solid #363636;
+ border-top: 1px solid #363636;
+ border-bottom: 1px solid #363636;
}
.tbl th:last-child {
- border-right: 1px solid lightgrey;
- border-top: 1px solid lightgrey;
- border-bottom: 1px solid lightgrey;
+ border-right: 1px solid #363636;
+ border-top: 1px solid #363636;
+ border-bottom: 1px solid #363636;
}
.tbl th:only-child {
- border: 1px solid lightgrey;
+ border: 1px solid #363636;
}
-.tbl td{
- padding-left: 0.5em;
- padding-right: 0.5em;
+
+.tbl td {
+ padding: 0.25em 0.5em;
}
+
.tbl tr td:first-child {
- border-left: 1px solid lightgrey;
+ border-left: 1px solid #363636;
}
.tbl tr td:last-child {
- border-right: 1px solid lightgrey;
+ border-right: 1px solid #363636;
}
.tbl tr:first-child td {
- border-top: 1px solid lightgrey;
+ border-top: 1px solid #363636;
}
.tbl tr:last-child td:only-child {
- border-bottom: 1px solid lightgrey;
+ border-bottom: 1px solid #363636;
}
.tbl tr:last-child td:first-child {
- border-bottom: 1px solid lightgrey;
+ border-bottom: 1px solid #363636;
}
.tbl tr:last-child td:last-child {
- border-bottom: 1px solid lightgrey;
+ border-bottom: 1px solid #363636;
}
.tbl tr:last-child td {
- border-bottom: 1px solid lightgrey;
+ border-bottom: 1px solid #363636;
}
table.fw-nat tbody tr td {
display: flex;
justify-content: center;
}
+
.rrdimage li:not(:first-child)::before {
content: "-";
padding: 0 0.3em;
.rrdimage button {
padding: 0.3em;
font-weight: 700;
- color: #d90000; /* link color */
+ color: #ff2e52;
border: none;
background: none;
cursor: pointer;
text-decoration: none;
}
+
.rrdimage button:focus {
outline: none;
box-shadow: none;
}
+
.rrdimage button.selected {
text-decoration: underline;
}
END
-print "<link href=\"/themes/ipfire/include/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
+print "<link href=\"/themes/ipfire/include/css/style.css?v=20240125\" rel=\"stylesheet\" type=\"text/css\" />\n";
if ($settings{'SPEED'} ne 'off') {
<body>
<div id="header" class="fixed">
<div id="logo">
- <a href="https://www.ipfire.org" style="text-decoration: none;">
- <img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
+ <h1>
+ <a href="https://www.ipfire.org">
+ IPFire_
+ </a>
END
;
if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
- print "</a><h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
- } else {
- print "<h1>IPFire</h1></a>";
+ print "‐ $settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
}
print <<END
+ </h1>
</div>
</div>
END
'host deny' => 'list with denied hosts',
'host ip' => 'Host IP address',
'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)',
-'hostile networks' => 'Hostile networks',
+'hostile networks in' => 'From Hostile Networks',
+'hostile networks out' => 'To Hostile Networks',
+'hostile networks total' => 'Total Hostile Networks',
'hostname' => 'Hostname',
'hostname and domain already in use' => 'Hostname and domain already in use.',
'hostname cant be empty' => 'Hostname cannot be empty.',
'locationblock enable feature' => 'Enable Location based blocking:',
'locationblock flag' => 'Flag',
'log' => 'Log',
+'log drop hostile in' => 'Log dropped packets FROM hostile networks',
+'log drop hostile out' => 'Log dropped packets TO hostile networks',
'log dropped conntrack invalids' => 'Log dropped packets classified as INVALID by connection tracking',
'log enabled' => 'Log Enabled',
'log level' => 'Log Level',
'refresh' => 'Refresh',
'refresh index page while connected' => 'Refresh index.cgi page while connected',
'refresh update list' => 'Refresh update list',
+'regenerate host certificate' => 'Renew Host Certificate',
'registered user rules' => 'Talos VRT rules for registered users',
'reiserfs warning1' => 'Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.',
'reiserfs warning2' => 'Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.',
'done' => 'Fait',
'dos charset' => 'Jeu de car. DOS',
'down and up speed' => 'Entrez votre débit descendant et montant <br /> et cliquez sur <i>Sauvegarder</i>.',
+'downfall gather data sampling' => 'Chute / collecte échantillons de données - proc. Intel',
'downlink' => 'Liaison descendante',
'downlink speed' => 'Débit descendant - download (kbit/sec) ',
'downlink std class' => 'Classe standard de réception ',
'external access rule removed' => 'Règle d\'accès externe supprimée ; Redémarrage du contrôleur d\'accès',
'external aliases configuration' => 'Configuration des alias externes',
'extrahd' => 'Options stockage',
-'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté',
+'extrahd because there is already a device mounted' => ', car il y a déjà un périphérique monté',
'extrahd cant umount' => 'Impossible de démonter',
'extrahd detected drives' => 'Périphériques de stockage détectés',
'extrahd install or load driver' => 'Si votre stockage n\'est pas visible ici, vous devez installer ou charger son pilote.<br />Si vous voyez votre stockage mais pas de partitions, vous devez tout d\'abord les créer.',
'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation',
+'extrahd mounted' => 'Monté',
+'extrahd no mount point given' => 'Aucun point de montage indiqué',
+'extrahd not configured' => 'Non configuré',
+'extrahd not mounted' => 'Non monté',
'extrahd to' => 'vers',
'extrahd to root' => 'vers root',
'extrahd unable to read' => 'Impossible de lire',
'host deny' => 'Liste des hôtes non autorisés',
'host ip' => 'Adresse IP de l\'hôte ',
'host to net vpn' => 'Réseau privé virtuel (VPN) de l\'hôte au réseau (client nomade) ',
-'hostile networks' => 'Réseaux hostiles',
+'hostile networks' => 'Total réseaux hostiles',
+'hostile networks in' => 'Depuis réseaux hostiles',
+'hostile networks out' => 'Vers réseaux hostiles',
'hostname' => 'Nom hôte ',
'hostname and domain already in use' => 'Le nom d\'hôte et de domaine sont déjà utilisés.',
'hostname cant be empty' => 'Le nom d\'hôte ne peut pas être vide.',
'ids hide' => 'Cacher',
'ids ignored hosts' => 'Hôtes de liste blanche',
'ids log hits' => 'Total du nombre de règles activées pour',
-'ids log viewer' => 'Rapport IDs',
-'ids logs' => 'Rapports IDs',
+'ids log viewer' => 'Rapport IDS',
+'ids logs' => 'Rapports IDS',
'ids merge classifications' => 'Fusion des classements...',
'ids merge sid files' => 'Fusion des sid aux fichiers de messages...',
'ids monitor traffic only' => 'Surveiller seulement le trafic',
'locationblock enable feature' => 'Activer le blocage par localisation :',
'locationblock flag' => 'Drap.',
'log' => 'Rapport :',
+'log drop hostile in' => 'Journaliser les paquets abandonnés depuis des réseaux hostiles',
+'log drop hostile out' => 'Journaliser les paquets abandonnés vers des réseaux hostiles',
'log dropped conntrack invalids' => 'Journaliser les paquets abandonnés classés comme INVALIDES par le suivi de connexion',
'log enabled' => 'Journal activé',
'log level' => 'Niveau de rapport',
'refresh' => 'Actualiser',
'refresh index page while connected' => 'Actualiser la page index.cgi pendant la connexion',
'refresh update list' => 'Actualiser la liste des mises à jour',
+'regenerate host certificate' => 'Renouveler le certificat hôte',
'registered user rules' => 'Règles Sourcefire VRT pour les utilisateurs enregistrés',
+'reiserfs warning1' => 'Reiserfs est obsolète et devrait être supprimé du noyau en 2025.',
+'reiserfs warning2' => 'Assurez-vous qu\'une nouvelle installation est effectuée à l\'aide des systèmes de fichiers ext4 ou xfs avant cette date.',
'release' => 'Révision',
'released' => 'Disponible',
'reload' => 'Recharger',
'root certificate' => 'Certificat racine',
'root path' => 'Répertoire root',
'root user password' => 'Mot de passe root',
-'route config changed' => '',
+'route config changed' => 'La configuration de la route a été modifiée',
'route subnet is invalid' => 'L\'itinéraire additionnel push du sous-réseau est non valide',
'router ip' => 'Adresse IP du routeur :',
'routing table' => 'Table de routage',
'source port overlaps' => 'La plage de port source chevauche une plage de port existante.',
'speaker off' => 'Haut-parleur éteint :',
'speaker on' => 'Haut-parleur allumé :',
+'spec rstack overflow' => 'Débordement de la pile de rendement spéculative - proc. AMD',
'spectre variant 1' => 'Spectre - variante 1',
'spectre variant 2' => 'Spectre - variante 2',
'spectre variant 4' => 'Spectre - variante 4',
'system logs' => 'Rapports système',
'system status information' => 'Informations sur le statut du système',
'ta key' => 'Clé d\'authentification TLS',
-'taa zombieload2' => 'TSX Async Abort/ZombieLoad v2',
+'taa zombieload2' => 'TSX Async Abort / ZombieLoad v2',
'tcp more reliable' => 'TCP (plus fiable)',
'telephone not set' => 'Numéro de téléphone non défini.',
'template' => 'Préétabli',
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 20230802.1
+
+THISAPP = abseil-cpp-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 98a9efb0fdc3801ff26d53202a1737cdf2d4115690f358abe16ba8b82625ee9df109e50ad50a30dc8e368b78630c3e7a31006801060b431c1b07b157366f1210
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && cmake . \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D BUILD_TESTING=OFF
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 2.3.1
+VER = 2.3.2
THISAPP = acl-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0
+$(DL_FILE)_BLAKE2 = 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-static
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --disable-static
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
chmod -v 755 /usr/lib/libacl.so
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 2.5.1
+VER = 2.5.2
THISAPP = attr-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04
+$(DL_FILE)_BLAKE2 = cf26348c3a96622e4f62493ac7655e14b6580d36a5784ef4c3750178856eceabd33192fd58516be21c8aa1ad41d56c024ad440ef4bc922bed8f7a4984ea16c63
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-4.0-profile-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-3.2-ssh_source_bash.patch
- for i in $$(seq 1 21); do \
+ for i in $$(seq 1 26); do \
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash52-$$(printf "%03d" "$${i}") || exit 1; \
done
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 9.16.45
+VER = 9.16.48
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2b6cea5e5b510780fb144cf9fce5fbec4adc6a2bb2186646f95afb4aa486edc326106519f149e600aec373238d55c06dfe7ac65f41016453a0967a28ec67ad7e
+$(DL_FILE)_BLAKE2 = 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7
install : $(TARGET)
include Config
-VER = 2.41
+VER = 2.42
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75
+$(DL_FILE)_BLAKE2 = e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = The BIRD Internet Routing Daemon
-VER = 2.0.12
+VER = 2.14
THISAPP = bird-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bird
-PAK_VER = 12
+PAK_VER = 13
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ca00574bb8e508255afb90e0d65f4e1763880699cff9877731d072efc48944b9f9ac77b35bb7ffd7b780e8e8b1c2eacdc38ee273353817c53723e7972fb5f0d6
+$(DL_FILE)_BLAKE2 = fe16b89c7f0ff35c5126366920960e0c55f57fe343380b2c32230122cf24f9abc3eb4d6ed9f37d2176f9e9340a83dffd1e68fed276b59b86cf1bdf5b8bd3c169
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.2.3
+VER = 1.2.7
SUMMARY = Deduplicating backup program with compression and authenticated encryption
THISAPP = borgbackup-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = borgbackup
-PAK_VER = 15
+PAK_VER = 16
DEPS = python3-msgpack python3-packaging python3-pyfuse3
# borgbackup only works with specific versions of python3-msgpack
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 970fad62428b44eb22df761020a4c25f4aa8d3e8f5cc2c81aa96b1afb051dc24b3d124b4fc84e81cf8eaa6a9b19a200f6f9bda1f7f4c2794a7e8d33e8d5020f1
+$(DL_FILE)_BLAKE2 = 8d69f3e7890ee117e1fe2cdf6b92c548bc40b337de09850948150034fc4724bf05c51c852a268df2294e3657676920a1c663a421331fd6dba5fffa558429f11e
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 20231204
+VER = 20240217
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Antivirus Toolkit
-VER = 1.2.1
+VER = 1.3.0
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 70
+PAK_VER = 71
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1373c6882b165e769dcc3c3631dfe7183231b2fe4830608b57d919af1a8e9a5a73aa3cc4767981a27bb9845390165b5241750904d50e1a90b7237200b97f7ef3
+$(DL_FILE)_BLAKE2 = dc411b1a905d2699c497870877fbe99e3910f8e29bc77830085c8ab75161c80066ca1396f47c3cd6a098c06c839464dbe31feb2e7e64622c657ad4a6a9401282
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cpufrequtils
-PAK_VER = 12
+PAK_VER = 14
DEPS =
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 10.0.4
+VER = 10.0.6
THISAPP = dhcpcd-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 770ee398eccff20cd4a37f89b841f8d580d9a42b456d93673ab3bf6ddf1ed0e49feda47ea8c1206a8a8582bccde80f45c3efbf2e1d0e493b06f04e2c6df876af
+$(DL_FILE)_BLAKE2 = 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 3.9
+VER = 3.10
THISAPP = diffutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f
+$(DL_FILE)_BLAKE2 = 24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
+ cd $(DIR_APP) && ./configure \
+ --prefix=$(PREFIX) \
+ --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 3.3
+VER = 3.5
THISAPP = dmidecode-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e
+$(DL_FILE)_BLAKE2 = 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/dmidecode-3.3-fix_crash_with_u_option.patch
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.19
+VER = 1.20
THISAPP = ed-$(VER)
DL_FILE = $(THISAPP).tar.lz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d
+$(DL_FILE)_BLAKE2 = d212c6d5302627145332ec25b989ca2d4a064ce5c0ea45ad1ad6b780ffd72037ff2144b933c52667c52192d6f5acd5766b5c31d4a2b5cf5993813c43e1523af3
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --exec-prefix="" \
+ --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = elfutils
-PAK_VER = 10
-
-DEPS =
-
-SERVICES =
###############################################################################
# Top-level Rules
b2 : $(subst %,%_BLAKE2,$(objects))
-dist:
- @$(PAK)
-
###############################################################################
# Downloading, checking, b2sum
###############################################################################
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 2.5.0
+VER = 2.6.0
THISAPP = expat-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 15a5dcd3af17995fb4299301710b38d609c1fe7a8d6a6284581fedd96e89e0c16526d0342fb55773ac9d678cd65dc5cdb1532c764eeb3a20ccdf1e168b96e337
+$(DL_FILE)_BLAKE2 = 2f0117317bde4e03d8662bcac1ff6c2bbb1af694846b21a82ac12d11ccd43032b481af72fa35298c3cb19b7426dba6a67e703904ca7b05663ffd854a42348bd0
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 5.44
+VER = 5.45
THISAPP = file-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42
+$(DL_FILE)_BLAKE2 = 30fc77c091e6624f2e9a950f4c6fe69ea6aa46d4a8ad9f20d49320a3675617c5bfbc9ff1ebba5eeb2cf4435c38d71b47b8beeb5146c9f55fe3bac11fe65e89bd
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-bzlib
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-bzlib
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Open-source formatting library for C++
-VER = 10.0.0
+VER = 10.2.1
THISAPP = fmt-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = fmt
-PAK_VER = 3
+PAK_VER = 4
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4e778fd352ed084b9790b59b4875fc6ed04b7a58a40b3673854dd00763f492cc838970e8faef77b5f9db5e912a2fc77943aedb4ca4afb64a3736129cc4611809
+$(DL_FILE)_BLAKE2 = 7bef719aa99464b5cb608c81ca78e23f3aed81cadfa9ed65246c4983a98f0cadb27983d42929ab4e0b5e264673e38d7658a4f7d5171e624b2431b3c6327071d9
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = freeradius
-PAK_VER = 19
+PAK_VER = 20
DEPS = libtalloc samba
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = FRRouting Routing daemon
-VER = 8.5.2
+VER = 9.1
THISAPP = frr-frr-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = frr
-PAK_VER = 6
+PAK_VER = 8
-DEPS = elfutils
+DEPS =
SERVICES = frr
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
+$(DL_FILE)_BLAKE2 = ba64f9455c38441f8cadce4eed435fb86344244e98bd1b675335887fb098be29adc035d722d3c128e136a4c6b0aa1adcbdc0e22815702e52170da940a5caf20a
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 0.22
+VER = 0.22.4
THISAPP = gettext-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5
+$(DL_FILE)_BLAKE2 = 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc
install : $(TARGET)
include Config
-VER = 2.38
+VER = 2.39
THISAPP = glibc-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4dd89af4d26fa5c4e4cf266f19c2746b44d797ce54739d86499e74cf334aaf311bcf6e30120fd7748453e653f
+$(DL_FILE)_BLAKE2 = 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb
install : $(TARGET)
@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/glibc-build
- # Patches from upstream
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0001-stdlib-Improve-tst-realpath-compatibility-with-sourc.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0002-x86-Fix-for-cache-computation-on-AMD-legacy-cpus.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0003-nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0004-x86-Fix-incorrect-scope-of-setting-shared_per_thread.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0005-x86_64-Fix-build-with-disable-multiarch-BZ-30721.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0006-i686-Fix-build-with-disable-multiarch.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0007-malloc-Enable-merging-of-remainders-in-memalign-bug-.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0008-malloc-Remove-bin-scanning-from-memalign-bug-30723.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0009-sysdeps-tst-bz21269-fix-test-parameter.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0010-sysdeps-tst-bz21269-handle-ENOSYS-skip-appropriately.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0011-sysdeps-tst-bz21269-fix-Wreturn-type.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0012-io-Fix-record-locking-contants-for-powerpc64-with-__.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0013-libio-Fix-oversized-__io_vtables.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0014-elf-Do-not-run-constructors-for-proxy-objects.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0015-elf-Always-call-destructors-in-reverse-constructor-o.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0016-elf-Remove-unused-l_text_end-field-from-struct-link_.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0017-elf-Move-l_init_called_next-to-old-place-of-l_text_e.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0018-NEWS-Add-the-2.38.1-bug-list.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0019-CVE-2023-4527-Stack-read-overflow-with-large-TCP-res.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0020-getaddrinfo-Fix-use-after-free-in-getcanonname-CVE-2.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0021-iconv-restore-verbosity-with-unrecognized-encoding-n.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0022-string-Fix-tester-build-with-fortify-enable-with-gcc.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0023-manual-jobs.texi-Add-missing-item-EPERM-for-getpgid.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0024-Fix-leak-in-getaddrinfo-introduced-by-the-fix-for-CV.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0025-Document-CVE-2023-4806-and-CVE-2023-5156-in-NEWS.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0026-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.38/0027-tunables-Terminate-if-end-of-input-is-reached-CVE-20.patch
-
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
ifneq "$(TOOLCHAIN)" "1"
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 3.8.2
+VER = 3.8.3
THISAPP = gnutls-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d70524f17919bc02fefc610ede948d209e50e3276fc1e2d40aaed5c208265455da220d948f4a3f21db57f9d253c103f3a1b9a6daa2229d02c7c224448acc2777
+$(DL_FILE)_BLAKE2 = 27a4bb4d8a5697e2187113351b2ad1e849bca7bcfb556c1b54fc2d02bef16e2789e7c437ac8db8fe6d2bcfc0e3e3467bbff2dd5d2fc0adb9bf8bda81cb89e452
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = The Reliable, High Performance TCP/HTTP Load Balancer
-VER = 2.8.5
+VER = 2.9.2
-# From: https://www.haproxy.org/download/2.8/src/haproxy-2.8.1.tar.gz
+# From: https://www.haproxy.org/download/2.9/src/haproxy-2.9.2.tar.gz
THISAPP = haproxy-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = haproxy
-PAK_VER = 28
+PAK_VER = 29
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
+$(DL_FILE)_BLAKE2 = 257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.49.2
+VER = 1.49.3
THISAPP = help2man-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 62db47a5915432093991f060390a62ebf2d1e5e6e78f7142d0cd5f8a273a1fd74f55de4b3ead5c1071aaf4de084e62782981a1d888b8a8b76da9c07e0cda20ea
+$(DL_FILE)_BLAKE2 = a5ed9ea3ff78b5287fa5bc02302da6a3657fee8fefd4fc43289e209bbe128d58da633c38aa4039c93a761c4842d3549a73cc14e77ee2859ed256613a8fba6e23
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = An Interactive text-mode Process Viewer for Linux
-VER = 3.2.2
+VER = 3.3.0
THISAPP = htop-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = htop
-PAK_VER = 20
+PAK_VER = 21
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = da3b4aea4e5d32d4b432e0f45089e7795b59d9a947dc4af76cb6b7f9137e6d45901c8169c8d2c796a3f43162c1e3c8f1e18bd17f20750637e06fe4c3ebe22caa
+$(DL_FILE)_BLAKE2 = dabad4a4e973c5e0e9478e3b6cd1002369a3a3c8f152dbb72f0294ea3b8d92bbb79ab21b23ee997f2c142d5095e81706f3dfac023f27d9b3c83739754c3bf011
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 20231026
+VER = 20240125
# https://github.com/Mic92/iana-etc
THISAPP = iana-etc-$(VER)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = ce00884cc5ffeb7cc9fe7e3efb8f793282649bb4e1f914c9be6208afc8d81a79511f5910ae2906ffe64a88004007fdd05affe40153782d771bf1824cae834c8e
+$(DL_FILE)_BLAKE2 = 884a168ecfdc5d06f3cd8fc701a50d0ec4af44c975b6a563f41241b54b500191bf584b2efbd144f448271ae7f452847ee534982c3ee4fffdcf67c2c7f2bcffec
install : $(TARGET)
include Config
VER = v2.0
-PXE_VER = 1b67a05
+PXE_VER = 0cc0f47
THISAPP = ipfire-netboot-$(VER)
DL_FILE = $(THISAPP).tar.gz
ipxe-$(PXE_VER).tar.gz = $(URL_IPFIRE)/ipxe-$(PXE_VER).tar.gz
$(DL_FILE)_BLAKE2 = 5f66932b7be228f5a246b92352e31c99d4f4e8666da9795a6f9762c979f480fb3c2620fc128af14d396065d0c9362e1cdc10eddce2bb58901567581c0d5e8cee
-ipxe-$(PXE_VER).tar.gz_BLAKE2 = 5a6b7c422856157ff1f6aeb7e835add5a2bdd6678d8cc960eae2d926709ce73803484bbe0a428022de2fbc5b018096526ba48f2172c2c25540e1dc12c7a1f8e1
+ipxe-$(PXE_VER).tar.gz_BLAKE2 = f678abfe4cb1bf4ff85667719417c694365aece144c05fff8f8df82008100a6172bd27799498f27eddf8c38f43b3d553e704191037ef94dfbcaf19428c07028c
install : $(TARGET)
# Extract iPXE source
cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.gz
- cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-fix-stringop-truncation-warning-with-gcc-8-x.patch
- cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-handle-R_X86_64_PLT32.patch
- cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
- cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-use-the-right-sized-register-for-push.patch
cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
cd $(DIR_APP) && make $(MAKETUNING) bin/ipxe.lkrn
ifeq "$(BUILD_ARCH)" "x86_64"
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 6.6.0
+VER = 6.7.0
# https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/
THISAPP = iproute2-$(VER)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9d20f19c04c2bbde7a3ae53e61e4623b119570c8446f34b93ddadd64677caa432e00ee085498bc277e0842cc2124340c7100925106d0ef2c11dd8002aacac08f
+$(DL_FILE)_BLAKE2 = df55dffc54ed196d43a86ce40e887dca6390b91289a492266568ff31aa8b2827fbd91c18676e14706df844fbfe3a5c50bf927ed4401e098e385d401ec3d5c116
install : $(TARGET)
cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
cd $(DIR_APP) && make SBINDIR=/sbin install
cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin
- cd $(DIR_APP) && mv -v /usr/lib/iproute2 /etc/iproute2
+ cd $(DIR_APP) && mv -v /usr/share/iproute2 /etc/iproute2
# Add table for static routing
echo "200 static" >> /etc/iproute2/rt_tables
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 7.17
+VER = 7.19
THISAPP = ipset-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
+$(DL_FILE)_BLAKE2 = 04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--with-kmod=no \
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 20231222
+VER = 20240117
THISAPP = iputils-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a76d4e9741c4ce8d2a2b6337873400543c5bb51d61a794fdfed8c8f4228c41020f5203c8af7ca44a36877d246d4f67019d31f1a58e48c6fca7964d6ebc9d764b
+$(DL_FILE)_BLAKE2 = 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491
install : $(TARGET)
include Config
-VER = 0.5.44
+VER = 0.5.46
THISAPP = libhtp-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6b4c8d617e6a649997e9375677baed99315be83e598317ce4951883482e6099cb5fd28e27ae25ab68ecc765931b0955289d144a710ce2e1b11edf92848b1b613
+$(DL_FILE)_BLAKE2 = 326246433b3d8525cd211fec73bc0fdd9fb61a65001fc55d1fed4e966c53b16a1052ef0597990681d805c2c560e670b8b2d2558851971df6c31910dea571d0cc
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.41
+VER = 1.42
THISAPP = libidn-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6c632c2010f024792fd55d3c8e6f68e81152fa7421a4f65b6835d0dfd788707727381270c57bf46c6e252777e07ead501fdabdc55961c5c1604e81c53be5ab2b
+$(DL_FILE)_BLAKE2 = 8f16d388884ad2ac9aafc46ec5eae144508ca86135184f625761c82c02ec9f99400bd4db65c9c9df54d315502cd5e2d37893d171abc6d76abe0a70f29acdb68e
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
VER = 0.9.17
-DB_DATE = 2023-08-09
+DB_DATE = 2024-02-17
THISAPP = libloc-$(VER)
DL_FILE = $(THISAPP).tar.gz
location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz
$(DL_FILE)_BLAKE2 = b0bf860ebaccd3cb49c58c066c430f7a1f936a2029957db9b88e22c04240af0268a8f6388e8ca512102f14033037a2ab8bbb93fe83e525b9859c790c5c382df4
-location-$(DB_DATE).db.xz_BLAKE2 = 24ad4dc2496d3c0a7fe645374a02c8d4bf4724796ccf4ed00d2de9adfaa08f31cb70314afa5d8f7b7acebd4ccbd4d1f8a15b8da09a27b0092d74412cf30aa721
+location-$(DB_DATE).db.xz_BLAKE2 = 36432bed306871e96a741d364fdefaa677d47245e38596d1c7fb6a8f0a143e3ffa549e16effa58289b5481220b0a2560255e75b0bfe53219b1400d6d250aa02b
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Library for interfacing the Music Player Daemon
-VER = 2.19
+VER = 2.22
THISAPP = libmpdclient-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libmpdclient
-PAK_VER = 5
+PAK_VER = 6
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832
+$(DL_FILE)_BLAKE2 = 2ff692baaeb8160ce757e754ae08db57aca803628989e4dc3616f88eb02ebf1823d269d5a17afaa32bf32c7a384da0342db1ef083199f85ea7e0687cae0e8455
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.6.39
+VER = 1.6.41
THISAPP = libpng-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f0a2e643e921587334349f48758e61e69b4708ebc36575567767087878d262d134eeeb98fea7f0b6ff1493ea954910ca1608b10fea57196aad770eb807a9006e
+$(DL_FILE)_BLAKE2 = 43d8d1c563d9df46b663f706dca9563e31e6e47a2809a77a5d059de8cfa348721054df724d08ac24ef4717ffc101989941127df2d026c9537532375d9b432b68
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Samba talloc Library
-VER = 2.3.4
+VER = 2.4.1
THISAPP = talloc-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libtalloc
-PAK_VER = 2
+PAK_VER = 3
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31
+$(DL_FILE)_BLAKE2 = a7913b25930c77da53c17c2e0d71386402b1059f93c751084037c5068a035bd543c2d7e24a2d8dc989bb4eea13fa1a3c7a362e4d6c14af0b2030fbfb2f513801
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Server side daemon and supporting files for libvirt
-VER = 8.10.0
+VER = 10.0.0
THISAPP = libvirt-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-# SUP_ARCH = x86_64 aarch64
+SUP_ARCH = x86_64 aarch64
PROG = libvirt
-PAK_VER = 33
+PAK_VER = 34
DEPS = ebtables libpciaccess libyajl ncat qemu
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6c99428dd74ae1e535d0918bb48da0a851b03e9dfc38f96fca060a33b6be6c23c8b4a789695e8cf930536c156c8a893e18753a58c8a827f464b83a61b47c4846
+$(DL_FILE)_BLAKE2 = bfbea7805a949999481293a31e52a5511bcf86db2c96486cbc3b9cb776719ec973b1208cfcb4a8ae2c9220d1d68053980eaf68893f7919c3ef354efbd1abf642
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 2.1.4
+VER = 2.1.148
THISAPP = libyang-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0322d5c9003b4ae49a91da981c3c7063ebc783c1ddc964b9ec89a1f75f512fadda1664a8e2add63a81ed694bd10dda1fcdc70f7a31cc947b2835d210e8e454f5
+$(DL_FILE)_BLAKE2 = e955958319a4ad8c241720c3a425ab2a298916b8ba34e91ff2b43bafaae65fb0d41c904af894d3c5025ab253a40cb6f4732137b195169785628f6cedeb054acb
install : $(TARGET)
include Config
-VER = 6.6.11
+VER = 6.6.15
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2a2ad3fd93fdc099a3900918faaf6d7c3abae686694f90980586b7dba4ddd81a9312a7e0c684ddea37835395e6f83e203934988d83982ccc4308631d25d24b07
+$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = HardWare LiSter
-VER = B.02.19.2
+VER = B.02.20
THISAPP = lshw-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = lshw
-PAK_VER = 1
+PAK_VER = 2
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f
+$(DL_FILE)_BLAKE2 = 8abdd7cee6c42b8956229a0b62ac9f96359750f26cbfeb2ed74402eae3e7cd818133bf0b747351522c6387974ce2a98cf5ab29379e56c50abc980e497bcc19d7
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ltrace
-PAK_VER = 2
+PAK_VER = 3
-DEPS = elfutils
+DEPS =
SERVICES =
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 2.03.22
+VER = 2.03.23
THISAPP = LVM2.$(VER)
DL_FILE = $(THISAPP).tgz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033
+$(DL_FILE)_BLAKE2 = 00d215d395d92fa23743fc77d91a6bd14df29bc4fb334e1e8c4deb8d34007bfdb4e188821ec1789b5f0bca39fe944923050e401ddae0d25e4932cffb109a0dda
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.23
+VER = 1.24
THISAPP = lzip-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 934a35e31b0db76c4dcbe2fe903f04b60471485118aa5d4001599a3c23a7db74f05f703cf430bb299795be7025f71efb225afddff85c8245e962bdadcf82aef7
+$(DL_FILE)_BLAKE2 = ef6b7b51e7369b7b07ca2d5bbdd57a287f3a96866f50b327237a35ce9a4d19b2e3f7586a099ff4191c3c793de2dfe59120a42b8d744e220c4f7652d049df87f5
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
+ cd $(DIR_APP) && ./configure \
+ --prefix=$(PREFIX)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Midnight Commander
-VER = 4.8.30
+VER = 4.8.31
THISAPP = mc-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mc
-PAK_VER = 25
+PAK_VER = 26
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6
+$(DL_FILE)_BLAKE2 = aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 6.20
+VER = 7.00
THISAPP = memtest86plus-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966
+$(DL_FILE)_BLAKE2 = 608f4e31ddaee01d828cb1574086196c26f5e96c5049806ac3ab174ddf669db8cdcb8f336bec5a1ce74439d96fca505fea81311a06581bb43a8034156a4f8165
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Client for the Music Player Daemon
-VER = 0.34
+VER = 0.35
THISAPP = mpc-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpc
-PAK_VER = 9
+PAK_VER = 10
DEPS = mpd libmpdclient
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 709f54ceebd66f703e5b1bf6ff8deb890e484fdc29c0b2198922763e347caac89d6eec5f74101f9fa860436e7493e2b02cc6b1b26e800e783546fe5a0c6e0d8f
+$(DL_FILE)_BLAKE2 = 7e47d78b762b7334f5fec13897bdf11859310932371a55c189c4554b347f097852e5fa17be3df03d047fabcc60699a3b310d0aa395aadd96a5ebff009a2ddba0
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Music Player Daemon
-VER = 0.23.14
+VER = 0.23.15
THISAPP = mpd-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
-PAK_VER = 33
+PAK_VER = 37
# SUP_ARCH = aarch64 x86_64
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c048f128111d1d65775c317182b91d113339a5b09d3005c320cc3b14a79b7c1da0d1ba3d53f6bf348a3a404ceea33c1ad2427225f4a1f3d1cde4a921e71d6e1c
+$(DL_FILE)_BLAKE2 = 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7
install : $(TARGET)
#install initscripts
$(call INSTALL_INITSCRIPTS,$(SERVICES))
+ -mkdir -p /var/ipfire/mpd/db
+ touch /var/ipfire/mpd/playlist.m3u
+ install -v -m 664 $(DIR_SRC)/config/mpd/mpd.conf /var/ipfire/mpd/
+ echo "Folder for mpd database" > /var/ipfire/mpd/db/info
+ -mkdir -p /var/mp3
+ echo "Folder for music files" > /var/mp3/info
+ chown root.nobody /var/ipfire/mpd/{mpd.conf,playlist.m3u}
+ chmod 664 /var/ipfire/mpd/playlist.m3u
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/mpd /var/ipfire/backup/addons/includes/mpd
+
@rm -rf $(DIR_APP)
touch /var/log/mpd.error.log
touch /var/log/mpd.log
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpfire
-PAK_VER = 15
+PAK_VER = 17
DEPS = mpd mpc
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- -mkdir -p /var/ipfire/mpfire/{bin,db}
- touch /var/ipfire/mpfire/{settings,playlist.m3u}
+ -mkdir -p /var/ipfire/mpfire/bin
+ touch /var/ipfire/mpfire/settings
install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin
- install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/
install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/
- echo "Folder for mpd database" > /var/ipfire/mpfire/db/info
- -mkdir -p /var/mp3
- echo "Folder for music files" > /var/mp3/info
- chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u}
chown nobody.nobody /var/ipfire/mpfire/{settings,webradio}
- chmod 664 /var/ipfire/mpfire/playlist.m3u
chmod 755 /srv/web/ipfire/html/images/mpfire
install -v -m 644 $(DIR_SRC)/config/backup/includes/mpfire /var/ipfire/backup/addons/includes/mpfire
-mkdir -p /usr/lib/perl5/site_perl/5.36.0/Audio/
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP)/kpartx && make $(MAKETUNING)
+ cd $(DIR_APP)/kpartx && make $(MAKETUNING) CPPFLAGS=
cd $(DIR_APP)/kpartx && make install PREFIX=/usr
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+SUMMARY = Webfrontend for Music Player Daemon
+
+VER = 14.0.3
+
+THISAPP = myMPD-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = mympd
+PAK_VER = 3
+
+DEPS = mpd libmpdclient
+
+SERVICES = mympd
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 54a8f44d257e263470d80ea92a7fd5b6cfe8bd5523c258a04b4db9ac5031e3f4903a19671797424379ccfd96db1c6b5e47cb9427c71b2ff3c203959be2ede97d
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+ # Do not try to re-define _FORTIFY_SOURCE
+ cd $(DIR_APP) && sed -e "/D_FORTIFY_SOURCE/d" -i CMakeLists.txt
+
+ cd $(DIR_APP) && mkdir -p build
+ cd $(DIR_APP)/build && cmake -Wno-dev \
+ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+ cd $(DIR_APP)/build && make $(MAKETUNING)
+ cd $(DIR_APP)/build && make install
+
+ #generate config
+ mkdir -p /var/lib/mympd/config
+ echo false > /var/lib/mympd/config/http
+ echo 8800 > /var/lib/mympd/config/ssl_port
+ mkdir -p /var/lib/mympd/state
+ echo /var/mp3 > /var/lib/mympd/state/music_directory
+ chown nobody:nobody -R /var/lib/mympd
+
+ #install backup include
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/mympd \
+ /var/ipfire/backup/addons/includes/mympd
+
+ #install initscript
+ $(call INSTALL_INITSCRIPTS,$(SERVICES))
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
include Config
-VER = 3.2.0
+VER = 3.2.1
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 776123929796d2eb0f3974bf6ee3a55df9187231632837576bf5ded7b5917f052683cdfc756693c1bee6fe1ffc7c3cb1ebcf833018d3caf51886f4f4e7a495f1
+$(DL_FILE)_BLAKE2 = 960222e0305166160e5ab000e29650b92063bf726551ee9ad46060166d99738d1e3a5b86fd28b14c8f4fb3a72f5aa70850defb87c02990acff3dbcbdac40b347
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.5.3
+VER = 1.6.0
THISAPP = Linux-PAM-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb
+$(DL_FILE)_BLAKE2 = 8ad3ed2d58b48cf43d065f15669788c113eee2aa3fc86cf38565a0e4835b142564ff1af5bcd3377db08af77141d25b4e93752a387ff7eabc00b4a826aa9ea39d
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure --libdir=/usr/lib \
--sbindir=/lib/security \
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 0.42.2
+VER = 0.43.0
THISAPP = pixman-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957
+$(DL_FILE)_BLAKE2 = 1a807d4d5598a5fe6077d6bbc7786cba41a698a1f03801cc5367ade8707500ee215a0faf65afe85f9e040b0380f1074c2fdfd31c0805dc41a4e5e34e36416764
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 23.08.0
+VER = 24.01.0
THISAPP = poppler-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a35e44cc590e34991b27e53caf650dedf4d4aa4f9f82ed5d8a57b0ca6bb863c96fe0e9b9c9021b9722db48896d236c9e057bcbf45e9609eb237bf00481e91428
+$(DL_FILE)_BLAKE2 = 16c87a4338c73fcccfac3ac477807a7f96c8e95e68efff484d9d544da10815972f20d40f71091c6092913d82b205ca0d1bd25acbaba79277e1a1bf19ba397e6d
install : $(TARGET)
-DTESTDATADIR=$PWD/testfiles \
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-DENABLE_QT5=OFF \
+ -DENABLE_NSS3=OFF \
+ -DENABLE_GPGME=OFF \
+ -DENABLE_QT6=OFF \
..
cd $(DIR_APP)/build && make $(MAKETUNING)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 25.2
+
+THISAPP = protobuf-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 1ee7a48d3a481f523ff240c79e8cacb39b6a7e2c671279812cbffd5ce9be595034461fba41f03bed363133118c1b92bd14bcfd8c4e46ac6368e6407a23fb02ea
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && cmake . \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D protobuf_BUILD_TESTS=OFF \
+ -D protobuf_BUILD_SHARED_LIBS=ON \
+ -D protobuf_ABSL_PROVIDER=package
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.5.0
+
+THISAPP = protobuf-c-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 7b428655901f4fd74b67b75419552e7c02065a5291aed4dcc1d55b98c986caa9ccf846eb5e98e0954420c3e5bea559b0078843e00daa7b5c63465eec21e28204
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 22.1.0
+VER = 23.2.0
SUMMARY = Classes Without Boilerplate
THISAPP = attrs-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-attrs
-PAK_VER = 2
+PAK_VER = 3
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5da48b3cbcd99cdcc531a0859be264a4d209778caa53bd95480a103549b816c8a805079e1555fce38eb33f8bd3d5b7bfa6f814ef2b60dc405bda6686c7746f0b
+$(DL_FILE)_BLAKE2 = a06f4f17a81fc173c37661bcf518367a1cdc9a333d2783bd2cd1ac5f0a72bd20ec1afdd964e10255624bcfa027e3a152375cd21472c177428d29bd06b29984a1
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && python3 setup.py build
- cd $(DIR_APP) && python3 setup.py install --root=/
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2022.6.26
+
+THISAPP = calver-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = bd75214d1107d5c58c07221b014fcca9c19df8b01ffc110a43a83ce7cd4e4c9746fc7c5a2f6be9eed5ffcfce0f8d38a70901deeba4d21727e53aed2383cbedef
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.5
+
+THISAPP = editables-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 0daa314ad6841e8562a96923cd15b367995963efa7cff72fc1ff82232d9a1e07ee2dc30a8cba21195199c976335bfb2ebca720deaeafbd484a865235c97551a1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.1.1
+VER = 1.2.0
SUMMARY = This is a backport of the BaseExceptionGroup and ExceptionGroup classes from Python 3.11.
THISAPP = exceptiongroup-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-exceptiongroup
-PAK_VER = 1
+PAK_VER = 2
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c396d1e1ab15265e06d76d11e6cbbff5c4e52284f890d727aab65d0ab40fcd17e3db8827ba4bba6b34d13f66606ca34ac8bcc361dd4aecf9afe624d5001de327
+$(DL_FILE)_BLAKE2 = 4f3b5505c9c6e229eae52fda1e2dc957ada9e44eb8da8f2a8c62315ee93a1e2129005d0b4a1a7f3bbc2a1448e89929fdaf6ee59a40c8aefb44104c5e330d5ac9
install : $(TARGET)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 24.1.0
+
+THISAPP = hatch_fancy_pypi_readme-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 9baa6dd61c02f7bbc610b815db8476c10ace7623ac7cdfebbf2317d1f4f5713e898624fde1c915f9f8b5f92fea22dbff41963a0685ccf6f112180a8cf9cca59b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.4.0
+
+THISAPP = hatch_vcs-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = cc0e02cbedf968a630803791b455f22f2ce60966327a531aac87196d48f6cf192f74eab6e995a169659983b6049cb2e656ca3d7f3670445ef06eca65318c5c6a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.21.1
+
+THISAPP = hatchling-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 58d0ff8bd3d0717df0c51af903cda18c731d05422e71ebb091ccae695542257330c4ff7b97c60331996060c9a819b1c050813de5ab3f16203c7b81f9e93dc15a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.0.4
+VER = 1.0.7
SUMMARY = Python module for reading and writing MessagePack data
THISAPP = msgpack-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-msgpack
-PAK_VER = 3
+PAK_VER = 4
DEPS =
# borgbackup only works with specific versions of python3-msgpack - check when updating
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fcbaafbea57f87c949a43a6bd6f6507eb3a07ac5e4a9c44fabfbb7c07849f1edabb8dadcd99a547fed32bce0f900f965368c4ee744acd4e850cad5c27022f463
+$(DL_FILE)_BLAKE2 = 8ddf2acf6bf81498d981c3ec83cbdffde1b1611f8ac23d3377f3f1541e679eda288b40b949bd586ca24a7059da3a0f73fa797a661375135ec092f408521c8527
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 23.0
+VER = 23.2
THISAPP = packaging-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-packaging
-PAK_VER = 3
+PAK_VER = 4
###############################################################################
# Top-level Rules
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 601806498c414aaf3a68206a008e4032b0925bb1a06b170a6da64786d15456b5a3082cfde7620cd39f3f0ec204f42337df4b6c663c76697b6dc9577d38cc45c3
+$(DL_FILE)_BLAKE2 = cf7986a07312fd82a2a0ee738088993b9570d95cd0b573afa7a1f911bf335de7084e3d40d961adea7f5a8369738688f9d0a4265ef26a393f2d30769bc13f752a
install : $(TARGET)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.12.1
+
+THISAPP = pathspec-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = e5cf93dc0a24a51bdcbcec807514344ed4e39029a8f1abe8db7cf8fa4883ac2e74f8b1a3ad6cd44bcff538b5eecc5b091b145c6c8d170de574ce9217d58855cb
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 -m build \
+ --no-isolation \
+ --wheel
+ cd $(DIR_APP) && pip3 install \
+ --no-build-isolation \
+ --root="/" \
+ --no-deps \
+ --ignore-installed \
+ dist/*.whl
+ # remove temp build files in /root/.cache from rootfile
+ cd $(DIR_APP) && rm -R /root/.cache/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.4.0
+
+THISAPP = pluggy-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 0a8bff68f1871f0e571105012b0e3961771c6ee34a64711520084d0a951308d192187d01b14136c389b5bc09f127ead1a1f96ebffa7b345d2d5023157c049c43
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 3.2.2
+VER = 3.3.0
SUMMARY = Python3 bindings for libfuse3
THISAPP = pyfuse3-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-pyfuse3
-PAK_VER = 2
+PAK_VER = 3
DEPS = python3-trio
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a6f11083a3ddec031fdfe5cb810be526cba26d7bc9599a64d28e9a45281aeb04fca8728ff3788e44f1736475c89e64c3c1fd7cb964ff81fc30ce441a5dda7fae
+$(DL_FILE)_BLAKE2 = 29a871bbd4c82298231eac0c8d4b668a75a9ea748c3dd15f093a369770fbfe080620b6209c79ce934880757764c946c3216b558dcc63cd1d1a7ef03e124174c2
install : $(TARGET)
include Config
-VER = 0.22.0
+VER = 0.23.1
SUMMARY = async/await-native I/O library for Python
THISAPP = trio-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-trio
-PAK_VER = 3
+PAK_VER = 4
DEPS = python3-async_generator python3-attrs python3-sniffio python3-sortedcontainers python3-outcome python3-idna python3-exceptiongroup
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b76f49c45788d41cbeded573e54d88e525cb2ad80b05da4c61f6c5100bdc85271f26a0c3aee07ca858214092106d217a2176d60744892c768bbc8ecad9383190
+$(DL_FILE)_BLAKE2 = e7c1aa2ec7ef7fa8c5940e66d6322df1abf3def9b1026509dcd1783f968cdb42332c293905887f2892619efed5abbc353c7d552d0ba34153e3a4715fbe4e403c
install : $(TARGET)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2024.1.8
+
+THISAPP = trove-classifiers-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = f0a4ec5439415d53d81297001aac2b4ffc3da0e2c5492acb9a3ed23fba9e7c7ea1407cfa2f8291ab0b8ea7f1dd985cdd86a1b82e71b0223c88ae73bcc7ce63cd
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python3 setup.py build
+ cd $(DIR_APP) && python3 setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu
-PAK_VER = 41
+PAK_VER = 42
-DEPS = alsa elfutils libusbredir spice libseccomp libslirp
+DEPS = alsa libusbredir spice libseccomp libslirp
SERVICES =
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
VER = 8.2
+# https://ftp.gnu.org/gnu/readline/
THISAPP = readline-$(VER)
DL_FILE = $(THISAPP).tar.gz
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- for i in $$(seq 1 1); do \
+ for i in $$(seq 1 10); do \
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline82-$$(printf "%03d" "$${i}") || exit 1; \
done
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-static
cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses
cd $(DIR_APP) && make install
/lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
/lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
$$f; \
- xz $$f; \
+ xz --check=crc32 --lzma2=dict=512KiB $$f; \
install -m 644 $$f.xz $(MODPATH); \
done
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 4.14.2
+VER = 4.14.3
THISAPP = shadow-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 419f0a516753616ef691f71ec9002eef6fd7568c013ac71900d7481eff1bd9165c69d9587b7ca25800543a2eac58cfb7ce4224063e8af7b278f589640485c28f
+$(DL_FILE)_BLAKE2 = 6707cae41a0f8478cadd94ea5eaba95cdc6b1b23896b8dd903c62c931839a82b0538f04f8c12433f148da5b23c12a033963380be81f6fc97fa0e3f9399e51b21
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.14.2-suppress_installation_of_groups.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.14.3-suppress_installation_of_groups.patch
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure \
--libdir=/lib \
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 3440100
+VER = 3450100
THISAPP = sqlite-autoconf-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8b0aa4b2fd36099e68502705d0187cf30b8755f61577942e9b8709d3ca3e56dfd64cf256d0b70a75e987f2894076cb32c170dd52cd278579a646b06b90140e9d
+$(DL_FILE)_BLAKE2 = 2725faccde5b964b3c037ae0f885b3461c01619e6c086e53f53cc1ecf7e75a46dd1ac4bec4803bc149014d158976607d195993e5d925b723284512a880010bf5
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 6.6
+VER = 6.7
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc
+$(DL_FILE)_BLAKE2 = f91b0f617b6b32138c33575d5daec0bc6dfcb0d356939b6c01e9d4c33b77886ffb55c38678f31aeed9bf4d5d5e488c751d41098b846a956383c8b6db8c851cab
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = strace
-PAK_VER = 10
+PAK_VER = 11
-DEPS = elfutils
+DEPS =
SERVICES =
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 5.69
+VER = 5.71
SUMMARY = Universal TLS Tunnel
THISAPP = stunnel-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = stunnel
-PAK_VER = 11
+PAK_VER = 12
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fd213d1c7bc9efb42ee501bccd720c6535d123fe9d78354ff14a1701edcc30f1b563ff46fa34fd3f53bb976a7e700f0cd63589a8488738314604e593a95ad7bd
+$(DL_FILE)_BLAKE2 = d323363c7bfdd6c0b7931b84a6069cf9a8337e967c31e14d15976d7932f0c0d6f40f7a1cbf5abbdff0e9edc52176cdcead4f848653088193b2debf4e77443b42
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 6.0.15
+VER = 7.0.3
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = cf5c2d5760e52f0b4eb0276feb89e056d74ef5478e3158a047fbdec14022aa6e0ba986b7ee9f9ec49e2ebb3f206c7d71ad8ce8dc4eb9a6b48b4ba38c96c2f1c6
+$(DL_FILE)_BLAKE2 = b42044428ae5ac4ecd6b41d083f0f3ac5839bf9a0734c3a64bb5e9a6f1a0ffe0c1f5da262f4e167461836bd26ebf9238ec9c0c213ba61f6419b6af1314f3becb
install : $(TARGET)
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-disable-sid-2210059.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detection.patch
cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \
--prefix=/usr \
--sysconfdir=/etc \
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = A BitTorrent client with multiple UIs
-VER = 4.0.4
+VER = 4.0.5
THISAPP = transmission-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
-PAK_VER = 20
+PAK_VER = 22
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0cdf6075dffba941cbb47924879e8849938620068f3389fe6d5a03b100d11d66a0d33692738001092b8ac3ea181d9cfb554ba1bb2553dc7f06fd83b04f7e0ca9
+$(DL_FILE)_BLAKE2 = 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.19.0
+VER = 1.19.1
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 66ec2b1cd32ac5930c088c73e884bc1fb4d35526a0c89bdbe209defd3e78326ce9b3c1a523fc1ab28b8fdf0e457280d5de7b300cf560c15d875f460bc361f5c7
+$(DL_FILE)_BLAKE2 = a48c5b9493eb0a9aa2171956e08677e1cfb7c49b53731c1b05f9192434c4d815eba972aab110ba0ee25fee1e7a57192c8b48e59bb21fb76ad7fd1c7d2d260012
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Video Disk Recorder
-VER = 2.4.7
+VER = 2.6.6
# VDRPLUGVER must match with APIVERSION! in config.h
# after change this update also all vdr plugins
-VDRPLUGVER = 2.4.7
+VDRPLUGVER = 2.6.6
THISAPP = vdr-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr
-PAK_VER = 15
+PAK_VER = 17
DEPS = vdr_streamdev
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab
+$(DL_FILE)_BLAKE2 = 22ad6d0d4048347ff16a48ad137900f32dda7adfc7fb54bb1501f14cfc426185f942ffa4997de1e0318ca8c6b67a7dfc48d49b30bfda9367d7337b2d601544fc
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_dvbapi
-PAK_VER = 6
+PAK_VER = 7
DEPS =
SERVICES =
-VDRPLUGVER = 2.4.7
+VDRPLUGVER = 2.6.6
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_eepg
-PAK_VER = 5
+PAK_VER = 6
DEPS =
SERVICES =
-VDRPLUGVER = 2.4.7
+VDRPLUGVER = 2.6.6
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = Searchtimer and replacement of the VDR program menu
-VER = 2.4.0+git20191101
+VER = 2.4.2
-THISAPP = vdr-plugin-epgsearch_$(VER).orig
+THISAPP = vdr-plugin-epgsearch-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/vdr-plugin-epgsearch
+DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_epgsearch
-PAK_VER = 11
+PAK_VER = 12
DEPS =
SERVICES =
-VDRPLUGVER = 2.4.7
+VDRPLUGVER = 2.6.6
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d48a3174c451ddca257d36c45747d41f7c628b8963558115f27053ef6d57cc5b3c6d5860a6af46dd37f16d6ad7f29c9fb10c4295be76e60cbfef4943ca456241
+$(DL_FILE)_BLAKE2 = 1e2ed02a2d8ac1ba1e2ffd72b7830c4bb9a3478cebce8affd871e7cac25ac7759f21908447d74652632541dca74cbeb8e4de9773550bad65d279770677b7e146
install : $(TARGET)
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-gcc1.patch
cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = VDR implementation of the VTP (Video Transfer Protocol)
-VER = 0.6.1
-GIT_VER = e2a9b979d3fb92967c7a6a8221e674eb7e55c813
+VER = 0.6.3
-THISAPP = vdr-plugin-streamdev-$(GIT_VER)
-DL_FILE = $(THISAPP).tar.bz2
+THISAPP = vdr-plugin-streamdev-$(VER)
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_streamdev
-PAK_VER = 7
+PAK_VER = 8
DEPS =
SERVICES =
-VDRPLUGVER = 2.4.7
+VDRPLUGVER = 2.6.6
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4cacadc091ab8d28ccd4318eaf18aaef8f45e6caab86ef461d1b1047039ec921984ebad091d29420779982b5b37606defe5aa6c6828e8f28788886ba9839efea
+$(DL_FILE)_BLAKE2 = 300c24aac6f0c59fc438eafa9a300e0b68dbfb43064cf887ab9d1fbdc1b22a8ec5349a38fa5c2188ef78dbc1ac7f238e88abe0ed9d1cbcd01e4a1afde7b890cf
install : $(TARGET)
DIR_APP = $(DIR_SRC)/vim90
TARGET = $(DIR_INFO)/$(THISAPP)
+# vim tries to build itself with FORTIFY_SOURCE=1 and is not very good at
+# filtering out any CFLAGS that might change that. So we do this ourselves.
+CFLAGS := $(filter-out -Wp$(COMMA)-U_FORTIFY_SOURCE,$(CFLAGS))
+
###############################################################################
# Top-level Rules
###############################################################################
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 2.11
+VER = 2.12
THISAPP = vnstat-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6
+$(DL_FILE)_BLAKE2 = af6982bc6da66ed2cebfe99e1b46a540528886d1c6e7a5174a3083a315804cb42c2395f3a0f5df552e8fd6b7823a01873fc5f9fb2178529c53481a67552dab35
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
SUMMARY = An ncurses monitoring application for wireless network devices
-VER = 0.9.4
+VER = 0.9.5
THISAPP = wavemon-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wavemon
-PAK_VER = 2
+PAK_VER = 3
DEPS =
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e07feb16dba86b1a91dc9b7d7df51da1b4498d8ea1a6ca36f6ae1e30e0e0bb09971330a470cde3425e7ae785bbd2819460ac2f1ddc2bc8da3aae29de3356bdbb
+$(DL_FILE)_BLAKE2 = 492ac0f16da1400b4e9e06af43b1ec8b96303bd33a62f355820975db61efc3b0603e1e3f97be05a69597b9546aeb95e3a2655cb0c45c90aa9f2bd765a06b8884
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/wavemon-0.9.4-force-netlink-include-path.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/wavemon-0.9.5-force-netlink-include-path.patch
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure \
--prefix=/usr
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 5.4.5
+VER = 5.4.6
THISAPP = xz-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 08d9afebd927ea5d155515a4c9eedda4d1a249f2b1ab6ada11f50e5b7a3c90b389b32378ab1c0872c7f4627de8dff37149d85e49f7f4d30614add37320ec4f3e
+$(DL_FILE)_BLAKE2 = d609590f1e9f13404988050e1bfdc623b996794b603cf2e39d2fd592be1967c97d8beaba9196eae4a0d448a432b1d7499986b7f669e736b65ec67590a04af9f7
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
include Config
-VER = 1.3
+VER = 1.3.1
THISAPP = zlib-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a
+$(DL_FILE)_BLAKE2 = 42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910
install : $(TARGET)
SNAME="ipfire" # Short name
# If you update the version don't forget to update backupiso and add it to core update
VERSION="2.29" # Version number
-CORE="183" # Core Level (Filename)
+CORE="185" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
MAX_RETRIES=1 # prefetch/check loop
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20231206
+TOOLCHAINVER=20240210
# use multicore and max compression
ZSTD_OPT="-T0 --ultra -22"
TOOLS_DIR="/tools_${BUILD_ARCH}"
# Enables hardening
- HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection"
+ HARDENING_CFLAGS="-Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection"
- CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
+ CFLAGS="-O2 -g0 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
CXXFLAGS="${CFLAGS}"
RUSTFLAGS="-Copt-level=3 -Clink-arg=-Wl,-z,relro,-z,now -Ccodegen-units=1 --cap-lints=warn ${RUSTFLAGS_ARCH}"
lfsmake2 python3-terminaltables
lfsmake2 python3-pkgconfig
lfsmake2 python3-msgpack
+ lfsmake2 python3-editables
+ lfsmake2 python3-pathspec
+ lfsmake2 python3-pluggy
+ lfsmake2 python3-calver
+ lfsmake2 python3-trove-classifiers
+ lfsmake2 python3-hatchling
+ lfsmake2 python3-hatch-vcs
+ lfsmake2 python3-hatch-fancy-pypi-readme
lfsmake2 python3-attrs
lfsmake2 python3-sniffio
lfsmake2 python3-sortedcontainers
lfsmake2 dnsdist
lfsmake2 bird
lfsmake2 libyang
+ lfsmake2 abseil-cpp
+ lfsmake2 protobuf
+ lfsmake2 protobuf-c
lfsmake2 frr
lfsmake2 dmidecode
lfsmake2 mcelog
lfsmake2 perl-MIME-Base32
lfsmake2 perl-URI-Encode
lfsmake2 rsnapshot
+ lfsmake2 mympd
lfsmake2 wsdd
# Kernelbuild ... current we have no platform that need
--- /dev/null
+#!/bin/bash
+
+# Restart collectd because the ping plugin does not re-resolve "gateway"
+if pgrep collectd &>/dev/null; then
+ exec /etc/init.d/collectd restart &>/dev/null
+fi
+
+exit 0
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
. /etc/sysconfig/rc
. ${rc_functions}
+GOV="ondemand"
+
case "${1}" in
start)
boot_mesg -n "Starting cpufreq... "
# try cpufreq hardware depend modules
for i in $(find /lib/modules/$(uname -r)/kernel/drivers/cpufreq \
- ! -name speedstep-lib.ko.xz ! -name p4-clockmod.ko.xz ! -name "cpufreq_*" ! -name mperf.ko.xz | sort -d -r); do
+ ! -name speedstep-lib.ko.xz ! -name p4-clockmod.ko.xz ! -name amd-pstate* ! -name "cpufreq_*" ! -name mperf.ko.xz | sort -d -r); do
module=$(basename $i | cut -d. -f1);
modprobe $module > /dev/null 2>&1;
if [ ${?} = 0 ]; then
driver=`cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver 2>/dev/null`
case "$driver" in
- intel_pstate)
- # pstate use internal gov so skip this setting
+ *pstate*)
+ # pstate not support ondemand so use powersave
+ GOV="powersave"
echo_ok;
;;
- *)
- CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus 2> /dev/null | wc -l `;
- let CPUCOUNT-=1
- # Set the governor to ondemand to test if it works
- cpufreq-set -g ondemand
- if [ ${?} = 0 ]; then
- # Set the governor to ondemand for all cpus
- for i in `seq 0 $CPUCOUNT`;
- do
- cpufreq-set -c $i -g ondemand
- done
- echo_ok;
- else
- echo_failure;
- fi
- ;;
- esac
- exit 0;
+ esac
+ CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus 2> /dev/null | wc -l `;
+ let CPUCOUNT-=1
+ # Set the governor to test if it works
+ cpufreq-set -g $GOV
+ if [ ${?} = 0 ]; then
+ # Set the governor to ondemand for all cpus
+ for i in `seq 0 $CPUCOUNT`;
+ do
+ cpufreq-set -c $i -g $GOV > /dev/null
+ done
+ echo_ok;
+ else
+ echo_failure;
+ fi
+ exit 0
;;
*)
echo "Usage: ${0} {start}"
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 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 #
case "$1" in
start)
boot_mesg "Starting MPD..."
- chown -R root.nobody /var/ipfire/mpfire/db
+ chown -R root.nobody /var/ipfire/mpd/db
/bin/nice --5 /usr/bin/mpd
evaluate_retval
;;
--- /dev/null
+#!/bin/sh
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2024 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/>. #
+# #
+###############################################################################
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case "$1" in
+ start)
+
+ boot_mesg "Starting mympd..."
+ loadproc /usr/bin/mympd -u nobody -s >/dev/null 2>&1 &
+ evaluate_retval
+ ;;
+
+ stop)
+ boot_mesg "Stopping mympd..."
+ killproc /usr/bin/mympd >/dev/null 2>&1
+ evaluate_retval
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+
+ status)
+ statusproc /usr/bin/mympd
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
fi
- # sync after config update...
- sync
-
if [ $(date +%Y) -gt 2011 ]; then
boot_mesg "Starting Collection daemon..."
/usr/sbin/collectd -C /etc/collectd.conf
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
+if [ -r "/var/ipfire/tor/settings" ]; then
+ eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+fi
IFACE=`/bin/cat /var/ipfire/red/iface 2> /dev/null | /usr/bin/tr -d '\012'`
if [ -z $IFACE ]; then
IFACE="red0"
iptables -A FORWARD -j HOSTILE
iptables -A OUTPUT -j HOSTILE
- iptables -N HOSTILE_DROP
- iptables -A HOSTILE_DROP -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE "
- iptables -A HOSTILE_DROP -j DROP -m comment --comment "DROP_HOSTILE"
+ iptables -N HOSTILE_DROP_IN
+ if [ "$LOGDROPHOSTILEIN" == "on" ]; then
+ iptables -A HOSTILE_DROP_IN -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE "
+ fi
+ iptables -A HOSTILE_DROP_IN -j DROP -m comment --comment "DROP_HOSTILE"
+
+ iptables -N HOSTILE_DROP_OUT
+ if [ "$LOGDROPHOSTILEOUT" == "on" ]; then
+ iptables -A HOSTILE_DROP_OUT -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE "
+ fi
+ iptables -A HOSTILE_DROP_OUT -j DROP -m comment --comment "DROP_HOSTILE"
+
# IP Address Blocklist chains
iptables -N BLOCKLISTIN
# run captivectrl
/usr/local/bin/captivectrl
+ # If a Tor relay is enabled apply firewall rules
+ if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then
+ /usr/local/bin/torctrl restart 1> /dev/null
+ fi
+
# POLICY CHAIN
iptables -N POLICYIN
iptables -A INPUT -j POLICYIN
fi
# Try to sync time with a known time server
- boot_mesg "DNS not functioning... Trying to sync time with ntp.ipfire.org (81.3.27.46)..."
+ boot_mesg "DNS not functioning... Trying to sync time with time.ipfire.org (81.3.27.46)..."
loadproc /usr/local/bin/settime 81.3.27.46
}
make_resolvconf
# Set time
- ntpdate "ntp.ipfire.org"
+ ntpdate "time.ipfire.org"
;;
EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP)
if device_is_mdraid "${device}"; then
local slave
for slave in $(mdraid_get_slaves "${device}"); do
- grub_install "${slave}"
+ grub_install "${slave}" || return $?
done
# Handle normal block devices
else
- grub_install "${device}"
+ grub_install "${device}" || return $?
fi
return 0
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+ln -svf /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd
+ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
+ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
+ln -svf /var/ipfire/mpd/mpd.conf /etc/mpd.conf
+touch /var/log/mpd.log
+restore_backup ${NAME}
+/etc/init.d/mpd restart
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/etc/init.d/mpd stop
+make_backup ${NAME}
+remove_files
+rm -f /etc/rc.d/rc*.d/???mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_backup_includes
+./uninstall.sh
+./install.sh
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>. #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
-ln -svf /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd
-ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
-ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
-ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf
chmod 755 /srv/web/ipfire/html/images/mpfire
-touch /var/log/mpd.log
restore_backup ${NAME}
-# comment removed option from config
-sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf
-#
-/etc/init.d/mpd start
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
-/etc/init.d/mpd stop
make_backup ${NAME}
remove_files
-rm -f /etc/rc.d/rc*.d/*mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>. #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+ln -svf /etc/init.d/mympd /etc/rc.d/rc3.d/S66mympd
+ln -svf /etc/init.d/mympd /etc/rc.d/rc0.d/K34mympd
+ln -svf /etc/init.d/mympd /etc/rc.d/rc6.d/K34mympd
+restore_backup ${NAME}
+# create/check config
+/usr/bin/mympd -u nobody -c
+# start services
+/etc/init.d/mpd restart
+/etc/init.d/mympd start
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/etc/init.d/mpd stop
+make_backup ${NAME}
+remove_files
+rm -f /etc/rc.d/rc*.d/???mympd
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007-2024 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_backup_includes
+./uninstall.sh
+./install.sh
--- /dev/null
+--- Linux-PAM-1.6.0/libpam/pam_handlers.c.orig 2024-01-17 11:29:36.000000000 +0100
++++ Linux-PAM-1.6.0/libpam/pam_handlers.c 2024-01-22 16:02:45.546376172 +0100
+@@ -500,7 +500,7 @@
+
+ if (pamh->confdir == NULL
+ && (f = fopen(PAM_CONFIG,"r")) != NULL) {
+- retval = _pam_parse_conf_file(pamh, f, NULL, PAM_T_ANY, 0, 1);
++ retval = _pam_parse_conf_file(pamh, f, NULL, PAM_T_ANY, 0, 0, 1);
+ fclose(f);
+ } else
+ #endif /* PAM_READ_BOTH_CONFS */
--- /dev/null
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.2
+Patch-ID: bash52-022
+
+Bug-Reported-by: srobertson@peratonlabs.com
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00049.html
+
+Bug-Description:
+
+It's possible for readline to try to zero out a line that's not null-
+terminated, leading to a memory fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.2-patched/lib/readline/display.c 2022-04-05 10:47:31.000000000 -0400
+--- lib/readline/display.c 2022-12-13 13:11:22.000000000 -0500
+***************
+*** 2684,2692 ****
+
+ if (visible_line)
+! {
+! temp = visible_line;
+! while (*temp)
+! *temp++ = '\0';
+! }
+ rl_on_new_line ();
+ forced_display++;
+--- 2735,2740 ----
+
+ if (visible_line)
+! memset (visible_line, 0, line_size);
+!
+ rl_on_new_line ();
+ forced_display++;
+
+*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.2
+Patch-ID: bash52-023
+
+Bug-Reported-by: Emanuele Torre <torreemanuele6@gmail.com>
+Bug-Reference-ID: <20230206140824.1710288-1-torreemanuele6@gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00045.html
+
+Bug-Description:
+
+Running `local -' multiple times in a shell function would overwrite the
+original saved set of options.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.2-patched/builtins/declare.def 2023-01-04 20:40:28.000000000 -0500
+--- builtins/declare.def 2023-02-08 15:36:49.000000000 -0500
+***************
+*** 421,429 ****
+ if (local_var && variable_context && STREQ (name, "-"))
+ {
+ var = make_local_variable ("-", 0);
+! FREE (value_cell (var)); /* just in case */
+! value = get_current_options ();
+! var_setvalue (var, value);
+! VSETATTR (var, att_invisible);
+ NEXT_VARIABLE ();
+ }
+--- 421,437 ----
+ if (local_var && variable_context && STREQ (name, "-"))
+ {
++ int o;
++
++ o = localvar_inherit;
++ localvar_inherit = 0;
+ var = make_local_variable ("-", 0);
+! localvar_inherit = o;
+!
+! if (value_cell (var) == NULL) /* no duplicate instances */
+! {
+! value = get_current_options ();
+! var_setvalue (var, value);
+! VSETATTR (var, att_invisible);
+! }
+ NEXT_VARIABLE ();
+ }
+
+*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.2
+Patch-ID: bash52-024
+
+Bug-Reported-by: Marco <maroloccio@gmail.com>
+Bug-Reference-ID: <eaf9af76-c4ed-8b61-c517-22ed980529d3@gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2023-02/msg00044.html
+
+Bug-Description:
+
+Fix bug where associative array compound assignment would not expand tildes
+in values.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20230105/arrayfunc.c Thu Jan 5 14:23:28 2023
+--- arrayfunc.c Wed Feb 8 16:27:48 2023
+***************
+*** 651,655 ****
+ }
+
+! aval = expand_subscript_string (v, 0);
+ if (aval == 0)
+ {
+--- 651,655 ----
+ }
+
+! aval = expand_assignment_string_to_string (v, 0);
+ if (aval == 0)
+ {
+***************
+*** 843,847 ****
+ if (assoc_p (var))
+ {
+! val = expand_subscript_string (val, 0);
+ if (val == 0)
+ {
+--- 843,847 ----
+ if (assoc_p (var))
+ {
+! val = expand_assignment_string_to_string (val, 0);
+ if (val == 0)
+ {
+***************
+*** 1031,1035 ****
+ nword[i++] = w[ind++];
+
+! t = expand_subscript_string (w+ind, 0);
+ s = (t && strchr (t, CTLESC)) ? quote_escapes (t) : t;
+ value = sh_single_quote (s ? s : "");
+--- 1031,1035 ----
+ nword[i++] = w[ind++];
+
+! t = expand_assignment_string_to_string (w+ind, 0);
+ s = (t && strchr (t, CTLESC)) ? quote_escapes (t) : t;
+ value = sh_single_quote (s ? s : "");
+*** ../bash-20230201/subst.c Mon Jan 30 16:19:46 2023
+--- subst.c Mon Feb 6 16:25:22 2023
+***************
+*** 10803,10807 ****
+--- 10803,10811 ----
+ ret = (char *)NULL;
+
++ #if 0
+ td.flags = W_NOPROCSUB|W_NOTILDE|W_NOSPLIT2; /* XXX - W_NOCOMSUB? */
++ #else
++ td.flags = W_NOPROCSUB|W_NOSPLIT2; /* XXX - W_NOCOMSUB? */
++ #endif
+ td.word = savestring (string); /* in case it's freed on error */
+
+
+*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.2
+Patch-ID: bash52-025
+
+Bug-Reported-by: Andrew Neff <andrew.neff@visionsystemsinc.com>
+Bug-Reference-ID: <SA1P110MB1357F68AFD51BB225019EFF48D2B9@SA1P110MB1357.NAMP110.PROD.OUTLOOK.COM>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-10/msg00100.html
+
+Bug-Description:
+
+Make sure a subshell checks for and handles any terminating signals before
+exiting (which might have arrived after the command completed) so the parent
+and any EXIT trap will see the correct value for $?.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.2.9/execute_cmd.c 2022-11-02 10:36:54.000000000 -0400
+--- execute_cmd.c 2022-10-27 16:52:55.000000000 -0400
+***************
+*** 1726,1729 ****
+--- 1726,1732 ----
+ : EXECUTION_SUCCESS;
+
++ /* Check for terminating signals before we return to our caller, which we
++ expect to exit immediately anyway. */
++ CHECK_TERMSIG;
+
+ /* If we were explicitly placed in a subshell with (), we need
+
+*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
--- /dev/null
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.2
+Patch-ID: bash52-026
+
+Bug-Reported-by: Stefan Klinger <readline-gnu.org@stefan-klinger.de>
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-08/msg00018.html
+
+Bug-Description:
+
+The custom color prefix that readline uses to color possible completions
+must have a leading `.'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.2-patched/lib/readline/colors.c 2021-12-08 11:38:25.000000000 -0500
+--- lib/readline/colors.c 2023-08-28 16:40:04.000000000 -0400
+***************
+*** 74,78 ****
+ static void restore_default_color (void);
+
+! #define RL_COLOR_PREFIX_EXTENSION "readline-colored-completion-prefix"
+
+ COLOR_EXT_TYPE *_rl_color_ext_list = 0;
+--- 74,78 ----
+ static void restore_default_color (void);
+
+! #define RL_COLOR_PREFIX_EXTENSION ".readline-colored-completion-prefix"
+
+ COLOR_EXT_TYPE *_rl_color_ext_list = 0;
+
+*** ../bash-5.2/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 26
+
+ #endif /* _PATCHLEVEL_H_ */
+++ /dev/null
-From 11e134e54d15e67a64c39a623f492a28df922517 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Tue, 19 Jan 2021 16:26:01 +0100
-Subject: dmidecode: Fix crash with -u option
-
-A segmentation fault was reported with option -u. Turns out to be a
-stupid thinko where the buffer offset was reset at the wrong loop
-depth.
-
-Reported-by: Jerry Hoemann <jerry.hoemann@hpe.com>
-Fixes: da06888d08b9 ("dmidecode: Use the print helpers in dump mode too")
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
----
- dmidecode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dmidecode.c b/dmidecode.c
-index 572cb1a..69ea0e8 100644
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_header *h)
- {
- int j, l = strlen(s) + 1;
-
-- off = 0;
- for (row = 0; row < ((l - 1) >> 4) + 1; row++)
- {
-+ off = 0;
- for (j = 0; j < 16 && j < l - (row << 4); j++)
- off += sprintf(raw_data + off,
- j ? " %02X" : "%02X",
---
-cgit v1.2.1
-
+++ /dev/null
-From 1117390ccd9cea139638db6f460bb6de70e28f94 Mon Sep 17 00:00:00 2001
-From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
-Date: Tue, 5 Jan 2021 10:36:29 +0100
-Subject: dmidecode: Fix the condition error in ascii_filter
-
-The normal printable ASCII range is 32 to 127 (not included),
-so fix the error in this if condition.
-
-Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
----
- dmidecode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dmidecode.c b/dmidecode.c
-index 27d5494..864a193 100644
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_t len)
- size_t i;
-
- for (i = 0; i < len; i++)
-- if (bp[i] < 32 || bp[i] == 127)
-+ if (bp[i] < 32 || bp[i] >= 127)
- bp[i] = '.';
- }
-
---
-cgit v1.2.1
-
+++ /dev/null
-From d97cca1e5df812be0e4de1e38091f02bb1e7ec4e Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 1 Aug 2023 10:27:15 +0200
-Subject: [PATCH 01/27] stdlib: Improve tst-realpath compatibility with source
- fortification
-
-On GCC before 11, IPA can make the fortified realpath aware that the
-buffer size is not large enough (8 bytes instead of PATH_MAX bytes).
-Fix this by using a buffer that is large enough.
-
-(cherry picked from commit 510fc20d73de12c85823d9996faac74666e9c2e7)
----
- stdlib/tst-realpath.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/stdlib/tst-realpath.c b/stdlib/tst-realpath.c
-index f325c95a44..3694ecd8af 100644
---- a/stdlib/tst-realpath.c
-+++ b/stdlib/tst-realpath.c
-@@ -24,6 +24,7 @@
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <malloc.h>
-@@ -50,7 +51,11 @@ void dealloc (void *p)
-
- char* alloc (void)
- {
-- return (char *)malloc (8);
-+#ifdef PATH_MAX
-+ return (char *)malloc (PATH_MAX);
-+#else
-+ return (char *)malloc (4096);
-+#endif
- }
-
- static int
---
-2.39.2
-
+++ /dev/null
-From ced101ed9d3b7cfd12d97ef24940cb00b8658c81 Mon Sep 17 00:00:00 2001
-From: Sajan Karumanchi <sajan.karumanchi@amd.com>
-Date: Tue, 1 Aug 2023 15:20:55 +0000
-Subject: [PATCH 02/27] x86: Fix for cache computation on AMD legacy cpus.
-
-Some legacy AMD CPUs and hypervisors have the _cpuid_ '0x8000_001D'
-set to Zero, thus resulting in zeroed-out computed cache values.
-This patch reintroduces the old way of cache computation as a
-fail-safe option to handle these exceptions.
-Fixed 'level4_cache_size' value through handle_amd().
-
-Reviewed-by: Premachandra Mallappa <premachandra.mallappa@amd.com>
-Tested-by: Florian Weimer <fweimer@redhat.com>
----
- sysdeps/x86/dl-cacheinfo.h | 226 ++++++++++++++++++++++++++++++++-----
- 1 file changed, 199 insertions(+), 27 deletions(-)
-
-diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
-index cd4d0351ae..285773039f 100644
---- a/sysdeps/x86/dl-cacheinfo.h
-+++ b/sysdeps/x86/dl-cacheinfo.h
-@@ -315,40 +315,206 @@ handle_amd (int name)
- {
- unsigned int eax;
- unsigned int ebx;
-- unsigned int ecx;
-+ unsigned int ecx = 0;
- unsigned int edx;
-- unsigned int count = 0x1;
-+ unsigned int max_cpuid = 0;
-+ unsigned int fn = 0;
-
- /* No level 4 cache (yet). */
- if (name > _SC_LEVEL3_CACHE_LINESIZE)
- return 0;
-
-- if (name >= _SC_LEVEL3_CACHE_SIZE)
-- count = 0x3;
-- else if (name >= _SC_LEVEL2_CACHE_SIZE)
-- count = 0x2;
-- else if (name >= _SC_LEVEL1_DCACHE_SIZE)
-- count = 0x0;
-+ __cpuid (0x80000000, max_cpuid, ebx, ecx, edx);
-+
-+ if (max_cpuid >= 0x8000001D)
-+ /* Use __cpuid__ '0x8000_001D' to compute cache details. */
-+ {
-+ unsigned int count = 0x1;
-+
-+ if (name >= _SC_LEVEL3_CACHE_SIZE)
-+ count = 0x3;
-+ else if (name >= _SC_LEVEL2_CACHE_SIZE)
-+ count = 0x2;
-+ else if (name >= _SC_LEVEL1_DCACHE_SIZE)
-+ count = 0x0;
-+
-+ __cpuid_count (0x8000001D, count, eax, ebx, ecx, edx);
-+
-+ if (ecx != 0)
-+ {
-+ switch (name)
-+ {
-+ case _SC_LEVEL1_ICACHE_ASSOC:
-+ case _SC_LEVEL1_DCACHE_ASSOC:
-+ case _SC_LEVEL2_CACHE_ASSOC:
-+ case _SC_LEVEL3_CACHE_ASSOC:
-+ return ((ebx >> 22) & 0x3ff) + 1;
-+ case _SC_LEVEL1_ICACHE_LINESIZE:
-+ case _SC_LEVEL1_DCACHE_LINESIZE:
-+ case _SC_LEVEL2_CACHE_LINESIZE:
-+ case _SC_LEVEL3_CACHE_LINESIZE:
-+ return (ebx & 0xfff) + 1;
-+ case _SC_LEVEL1_ICACHE_SIZE:
-+ case _SC_LEVEL1_DCACHE_SIZE:
-+ case _SC_LEVEL2_CACHE_SIZE:
-+ case _SC_LEVEL3_CACHE_SIZE:
-+ return (((ebx >> 22) & 0x3ff) + 1) * ((ebx & 0xfff) + 1) * (ecx + 1);
-+ default:
-+ __builtin_unreachable ();
-+ }
-+ return -1;
-+ }
-+ }
-+
-+ /* Legacy cache computation for CPUs prior to Bulldozer family.
-+ This is also a fail-safe mechanism for some hypervisors that
-+ accidentally configure __cpuid__ '0x8000_001D' to Zero. */
-
-- __cpuid_count (0x8000001D, count, eax, ebx, ecx, edx);
-+ fn = 0x80000005 + (name >= _SC_LEVEL2_CACHE_SIZE);
-+
-+ if (max_cpuid < fn)
-+ return 0;
-+
-+ __cpuid (fn, eax, ebx, ecx, edx);
-+
-+ if (name < _SC_LEVEL1_DCACHE_SIZE)
-+ {
-+ name += _SC_LEVEL1_DCACHE_SIZE - _SC_LEVEL1_ICACHE_SIZE;
-+ ecx = edx;
-+ }
-
- switch (name)
- {
-- case _SC_LEVEL1_ICACHE_ASSOC:
-- case _SC_LEVEL1_DCACHE_ASSOC:
-- case _SC_LEVEL2_CACHE_ASSOC:
-+ case _SC_LEVEL1_DCACHE_SIZE:
-+ return (ecx >> 14) & 0x3fc00;
-+
-+ case _SC_LEVEL1_DCACHE_ASSOC:
-+ ecx >>= 16;
-+ if ((ecx & 0xff) == 0xff)
-+ {
-+ /* Fully associative. */
-+ return (ecx << 2) & 0x3fc00;
-+ }
-+ return ecx & 0xff;
-+
-+ case _SC_LEVEL1_DCACHE_LINESIZE:
-+ return ecx & 0xff;
-+
-+ case _SC_LEVEL2_CACHE_SIZE:
-+ return (ecx & 0xf000) == 0 ? 0 : (ecx >> 6) & 0x3fffc00;
-+
-+ case _SC_LEVEL2_CACHE_ASSOC:
-+ switch ((ecx >> 12) & 0xf)
-+ {
-+ case 0:
-+ case 1:
-+ case 2:
-+ case 4:
-+ return (ecx >> 12) & 0xf;
-+ case 6:
-+ return 8;
-+ case 8:
-+ return 16;
-+ case 10:
-+ return 32;
-+ case 11:
-+ return 48;
-+ case 12:
-+ return 64;
-+ case 13:
-+ return 96;
-+ case 14:
-+ return 128;
-+ case 15:
-+ return ((ecx >> 6) & 0x3fffc00) / (ecx & 0xff);
-+ default:
-+ return 0;
-+ }
-+
-+ case _SC_LEVEL2_CACHE_LINESIZE:
-+ return (ecx & 0xf000) == 0 ? 0 : ecx & 0xff;
-+
-+ case _SC_LEVEL3_CACHE_SIZE:
-+ {
-+ long int total_l3_cache = 0, l3_cache_per_thread = 0;
-+ unsigned int threads = 0;
-+ const struct cpu_features *cpu_features;
-+
-+ if ((edx & 0xf000) == 0)
-+ return 0;
-+
-+ total_l3_cache = (edx & 0x3ffc0000) << 1;
-+ cpu_features = __get_cpu_features ();
-+
-+ /* Figure out the number of logical threads that share L3. */
-+ if (max_cpuid >= 0x80000008)
-+ {
-+ /* Get width of APIC ID. */
-+ __cpuid (0x80000008, eax, ebx, ecx, edx);
-+ threads = (ecx & 0xff) + 1;
-+ }
-+
-+ if (threads == 0)
-+ {
-+ /* If APIC ID width is not available, use logical
-+ processor count. */
-+ __cpuid (0x00000001, eax, ebx, ecx, edx);
-+ if ((edx & (1 << 28)) != 0)
-+ threads = (ebx >> 16) & 0xff;
-+ }
-+
-+ /* Cap usage of highest cache level to the number of
-+ supported threads. */
-+ if (threads > 0)
-+ l3_cache_per_thread = total_l3_cache/threads;
-+
-+ /* Get shared cache per ccx for Zen architectures. */
-+ if (cpu_features->basic.family >= 0x17)
-+ {
-+ long int l3_cache_per_ccx = 0;
-+ /* Get number of threads share the L3 cache in CCX. */
-+ __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
-+ unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
-+ l3_cache_per_ccx = l3_cache_per_thread * threads_per_ccx;
-+ return l3_cache_per_ccx;
-+ }
-+ else
-+ {
-+ return l3_cache_per_thread;
-+ }
-+ }
-+
- case _SC_LEVEL3_CACHE_ASSOC:
-- return ecx ? ((ebx >> 22) & 0x3ff) + 1 : 0;
-- case _SC_LEVEL1_ICACHE_LINESIZE:
-- case _SC_LEVEL1_DCACHE_LINESIZE:
-- case _SC_LEVEL2_CACHE_LINESIZE:
-+ switch ((edx >> 12) & 0xf)
-+ {
-+ case 0:
-+ case 1:
-+ case 2:
-+ case 4:
-+ return (edx >> 12) & 0xf;
-+ case 6:
-+ return 8;
-+ case 8:
-+ return 16;
-+ case 10:
-+ return 32;
-+ case 11:
-+ return 48;
-+ case 12:
-+ return 64;
-+ case 13:
-+ return 96;
-+ case 14:
-+ return 128;
-+ case 15:
-+ return ((edx & 0x3ffc0000) << 1) / (edx & 0xff);
-+ default:
-+ return 0;
-+ }
-+
- case _SC_LEVEL3_CACHE_LINESIZE:
-- return ecx ? (ebx & 0xfff) + 1 : 0;
-- case _SC_LEVEL1_ICACHE_SIZE:
-- case _SC_LEVEL1_DCACHE_SIZE:
-- case _SC_LEVEL2_CACHE_SIZE:
-- case _SC_LEVEL3_CACHE_SIZE:
-- return ecx ? (((ebx >> 22) & 0x3ff) + 1) * ((ebx & 0xfff) + 1) * (ecx + 1): 0;
-+ return (edx & 0xf000) == 0 ? 0 : edx & 0xff;
-+
- default:
- __builtin_unreachable ();
- }
-@@ -703,7 +869,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
- data = handle_amd (_SC_LEVEL1_DCACHE_SIZE);
- core = handle_amd (_SC_LEVEL2_CACHE_SIZE);
- shared = handle_amd (_SC_LEVEL3_CACHE_SIZE);
-- shared_per_thread = shared;
-
- level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE);
- level1_icache_linesize = handle_amd (_SC_LEVEL1_ICACHE_LINESIZE);
-@@ -716,13 +881,20 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
- level3_cache_size = shared;
- level3_cache_assoc = handle_amd (_SC_LEVEL3_CACHE_ASSOC);
- level3_cache_linesize = handle_amd (_SC_LEVEL3_CACHE_LINESIZE);
-+ level4_cache_size = handle_amd (_SC_LEVEL4_CACHE_SIZE);
-
- if (shared <= 0)
-- /* No shared L3 cache. All we have is the L2 cache. */
-- shared = core;
-+ {
-+ /* No shared L3 cache. All we have is the L2 cache. */
-+ shared = core;
-+ }
-+ else if (cpu_features->basic.family < 0x17)
-+ {
-+ /* Account for exclusive L2 and L3 caches. */
-+ shared += core;
-+ }
-
-- if (shared_per_thread <= 0)
-- shared_per_thread = shared;
-+ shared_per_thread = shared;
- }
-
- cpu_features->level1_icache_size = level1_icache_size;
---
-2.39.2
-
+++ /dev/null
-From 6b99458d197ab779ebb6ff632c168e2cbfa4f543 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 11 Aug 2023 10:10:16 +0200
-Subject: [PATCH 03/27] nscd: Do not rebuild getaddrinfo (bug 30709)
-
-The nscd daemon caches hosts data from NSS modules verbatim, without
-filtering protocol families or sorting them (otherwise separate caches
-would be needed for certain ai_flags combinations). The cache
-implementation is complete separate from the getaddrinfo code. This
-means that rebuilding getaddrinfo is not needed. The only function
-actually used is __bump_nl_timestamp from check_pf.c, and this change
-moves it into nscd/connections.c.
-
-Tested on x86_64-linux-gnu with -fexceptions, built with
-build-many-glibcs.py. I also backported this patch into a distribution
-that still supports nscd and verified manually that caching still works.
-
-Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-(cherry picked from commit 039ff51ac7e02db1cfc0c23e38ac7bfbb00221d1)
----
- include/ifaddrs.h | 4 ---
- inet/check_pf.c | 9 ------
- nscd/Makefile | 2 +-
- nscd/connections.c | 11 +++++++
- nscd/gai.c | 50 ------------------------------
- sysdeps/unix/sysv/linux/check_pf.c | 17 +---------
- 6 files changed, 13 insertions(+), 80 deletions(-)
- delete mode 100644 nscd/gai.c
-
-diff --git a/include/ifaddrs.h b/include/ifaddrs.h
-index 416118f1b3..19a3afb19f 100644
---- a/include/ifaddrs.h
-+++ b/include/ifaddrs.h
-@@ -34,9 +34,5 @@ extern void __check_native (uint32_t a1_index, int *a1_native,
- uint32_t a2_index, int *a2_native)
- attribute_hidden;
-
--#if IS_IN (nscd)
--extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
--#endif
--
- # endif /* !_ISOMAC */
- #endif /* ifaddrs.h */
-diff --git a/inet/check_pf.c b/inet/check_pf.c
-index 5310c99121..6d1475920f 100644
---- a/inet/check_pf.c
-+++ b/inet/check_pf.c
-@@ -60,12 +60,3 @@ __free_in6ai (struct in6addrinfo *in6ai)
- {
- /* Nothing to do. */
- }
--
--
--#if IS_IN (nscd)
--uint32_t
--__bump_nl_timestamp (void)
--{
-- return 0;
--}
--#endif
-diff --git a/nscd/Makefile b/nscd/Makefile
-index 2a0489f4cf..16b6460ee9 100644
---- a/nscd/Makefile
-+++ b/nscd/Makefile
-@@ -35,7 +35,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
- getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
- getsrvbynm_r getsrvbypt_r servicescache \
- dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
-- xmalloc xstrdup aicache initgrcache gai res_hconf \
-+ xmalloc xstrdup aicache initgrcache res_hconf \
- netgroupcache cachedumper
-
- ifeq ($(build-nscd)$(have-thread-library),yesyes)
-diff --git a/nscd/connections.c b/nscd/connections.c
-index a405a44a9b..15693e5090 100644
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -256,6 +256,17 @@ int inotify_fd = -1;
- #ifdef HAVE_NETLINK
- /* Descriptor for netlink status updates. */
- static int nl_status_fd = -1;
-+
-+static uint32_t
-+__bump_nl_timestamp (void)
-+{
-+ static uint32_t nl_timestamp;
-+
-+ if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
-+ atomic_fetch_add_relaxed (&nl_timestamp, 1);
-+
-+ return nl_timestamp;
-+}
- #endif
-
- /* Number of times clients had to wait. */
-diff --git a/nscd/gai.c b/nscd/gai.c
-deleted file mode 100644
-index e29f3fe583..0000000000
---- a/nscd/gai.c
-+++ /dev/null
-@@ -1,50 +0,0 @@
--/* Copyright (C) 2004-2023 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
--
-- 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; version 2 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 <https://www.gnu.org/licenses/>. */
--
--#include <alloca.h>
--#include <sys/stat.h>
--
--/* This file uses the getaddrinfo code but it compiles it without NSCD
-- support. We just need a few symbol renames. */
--#define __ioctl ioctl
--#define __getsockname getsockname
--#define __socket socket
--#define __recvmsg recvmsg
--#define __bind bind
--#define __sendto sendto
--#define __strchrnul strchrnul
--#define __getline getline
--#define __qsort_r qsort_r
--/* nscd uses 1MB or 2MB thread stacks. */
--#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
--#define __getifaddrs getifaddrs
--#define __freeifaddrs freeifaddrs
--#undef __fstat64
--#define __fstat64 fstat64
--#undef __stat64
--#define __stat64 stat64
--
--/* We are nscd, so we don't want to be talking to ourselves. */
--#undef USE_NSCD
--
--#include <getaddrinfo.c>
--
--/* Support code. */
--#include <check_pf.c>
--#include <check_native.c>
--
--/* Some variables normally defined in libc. */
--nss_action_list __nss_hosts_database attribute_hidden;
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 2b0b8b6368..3aa6a00348 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -66,25 +66,10 @@ static struct cached_data *cache;
- __libc_lock_define_initialized (static, lock);
-
-
--#if IS_IN (nscd)
--static uint32_t nl_timestamp;
--
--uint32_t
--__bump_nl_timestamp (void)
--{
-- if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
-- atomic_fetch_add_relaxed (&nl_timestamp, 1);
--
-- return nl_timestamp;
--}
--#endif
--
- static inline uint32_t
- get_nl_timestamp (void)
- {
--#if IS_IN (nscd)
-- return nl_timestamp;
--#elif defined USE_NSCD
-+#if defined USE_NSCD
- return __nscd_get_nl_timestamp ();
- #else
- return 0;
---
-2.39.2
-
+++ /dev/null
-From 5ea70cc02626d9b85f1570153873d8648a47bf95 Mon Sep 17 00:00:00 2001
-From: Noah Goldstein <goldstein.w.n@gmail.com>
-Date: Thu, 10 Aug 2023 19:28:24 -0500
-Subject: [PATCH 04/27] x86: Fix incorrect scope of setting `shared_per_thread`
- [BZ# 30745]
-
-The:
-
-```
- if (shared_per_thread > 0 && threads > 0)
- shared_per_thread /= threads;
-```
-
-Code was accidentally moved to inside the else scope. This doesn't
-match how it was previously (before af992e7abd).
-
-This patch fixes that by putting the division after the `else` block.
-
-(cherry picked from commit 084fb31bc2c5f95ae0b9e6df4d3cf0ff43471ede)
----
- sysdeps/x86/dl-cacheinfo.h | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
-index 285773039f..5ddb35c9d9 100644
---- a/sysdeps/x86/dl-cacheinfo.h
-+++ b/sysdeps/x86/dl-cacheinfo.h
-@@ -770,11 +770,10 @@ get_common_cache_info (long int *shared_ptr, long int * shared_per_thread_ptr, u
- level. */
- threads = ((cpu_features->features[CPUID_INDEX_1].cpuid.ebx >> 16)
- & 0xff);
--
-- /* Get per-thread size of highest level cache. */
-- if (shared_per_thread > 0 && threads > 0)
-- shared_per_thread /= threads;
- }
-+ /* Get per-thread size of highest level cache. */
-+ if (shared_per_thread > 0 && threads > 0)
-+ shared_per_thread /= threads;
- }
-
- /* Account for non-inclusive L2 and L3 caches. */
---
-2.39.2
-
+++ /dev/null
-From 6135d50e44233d8c89ca788f78c669941ad09fb9 Mon Sep 17 00:00:00 2001
-From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Date: Tue, 8 Aug 2023 09:27:54 -0300
-Subject: [PATCH 05/27] x86_64: Fix build with --disable-multiarch (BZ 30721)
-
-With multiarch disabled, the default memmove implementation provides
-the fortify routines for memcpy, mempcpy, and memmove. However, it
-does not provide the internal hidden definitions used when building
-with fortify enabled. The memset has a similar issue.
-
-Checked on x86_64-linux-gnu building with different options:
-default and --disable-multi-arch plus default, --disable-default-pie,
---enable-fortify-source={2,3}, and --enable-fortify-source={2,3}
-with --disable-default-pie.
-Tested-by: Andreas K. Huettel <dilfridge@gentoo.org>
-Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-
-(cherry picked from commit 51cb52214fcd72849c640b12f5099ed3ac776181)
----
- sysdeps/x86_64/memcpy.S | 2 +-
- sysdeps/x86_64/memmove.S | 3 +++
- sysdeps/x86_64/memset.S | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/sysdeps/x86_64/memcpy.S b/sysdeps/x86_64/memcpy.S
-index d98500a78a..4922cba657 100644
---- a/sysdeps/x86_64/memcpy.S
-+++ b/sysdeps/x86_64/memcpy.S
-@@ -1 +1 @@
--/* Implemented in memcpy.S. */
-+/* Implemented in memmove.S. */
-diff --git a/sysdeps/x86_64/memmove.S b/sysdeps/x86_64/memmove.S
-index f0b84e3b52..c3c08165e1 100644
---- a/sysdeps/x86_64/memmove.S
-+++ b/sysdeps/x86_64/memmove.S
-@@ -46,6 +46,9 @@ weak_alias (__mempcpy, mempcpy)
-
- #ifndef USE_MULTIARCH
- libc_hidden_builtin_def (memmove)
-+libc_hidden_builtin_def (__memmove_chk)
-+libc_hidden_builtin_def (__memcpy_chk)
-+libc_hidden_builtin_def (__mempcpy_chk)
- # if defined SHARED && IS_IN (libc)
- strong_alias (memmove, __memcpy)
- libc_hidden_ver (memmove, memcpy)
-diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
-index 7c99df36db..c6df24e8de 100644
---- a/sysdeps/x86_64/memset.S
-+++ b/sysdeps/x86_64/memset.S
-@@ -32,6 +32,7 @@
- #include "isa-default-impl.h"
-
- libc_hidden_builtin_def (memset)
-+libc_hidden_builtin_def (__memset_chk)
-
- #if IS_IN (libc)
- libc_hidden_def (__wmemset)
---
-2.39.2
-
+++ /dev/null
-From 7ac405a74c6069b0627dc2d8449a82a621f8ff06 Mon Sep 17 00:00:00 2001
-From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Date: Tue, 8 Aug 2023 09:27:55 -0300
-Subject: [PATCH 06/27] i686: Fix build with --disable-multiarch
-
-Since i686 provides the fortified wrappers for memcpy, mempcpy,
-memmove, and memset on the same string implementation, the static
-build tries to optimized it by not tying the fortified wrappers
-to string routine (to avoid pulling the fortify function if
-they are not required).
-
-Checked on i686-linux-gnu building with different option:
-default and --disable-multi-arch plus default, --disable-default-pie,
---enable-fortify-source={2,3}, and --enable-fortify-source={2,3}
-with --disable-default-pie.
-Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-
-(cherry picked from commit c73c96a4a1af1326df7f96eec58209e1e04066d8)
----
- sysdeps/i386/i686/memcpy.S | 2 +-
- sysdeps/i386/i686/mempcpy.S | 2 +-
- sysdeps/i386/i686/multiarch/memcpy_chk.c | 2 ++
- sysdeps/i386/i686/multiarch/memmove_chk.c | 2 ++
- sysdeps/i386/i686/multiarch/mempcpy_chk.c | 2 ++
- sysdeps/i386/i686/multiarch/memset_chk.c | 2 ++
- 6 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/sysdeps/i386/i686/memcpy.S b/sysdeps/i386/i686/memcpy.S
-index 9b48ec0ea1..b86af4aac9 100644
---- a/sysdeps/i386/i686/memcpy.S
-+++ b/sysdeps/i386/i686/memcpy.S
-@@ -27,7 +27,7 @@
- #define LEN SRC+4
-
- .text
--#if defined PIC && IS_IN (libc)
-+#if defined SHARED && IS_IN (libc)
- ENTRY_CHK (__memcpy_chk)
- movl 12(%esp), %eax
- cmpl %eax, 16(%esp)
-diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S
-index 26f8501e7d..14d9dd681a 100644
---- a/sysdeps/i386/i686/mempcpy.S
-+++ b/sysdeps/i386/i686/mempcpy.S
-@@ -27,7 +27,7 @@
- #define LEN SRC+4
-
- .text
--#if defined PIC && IS_IN (libc)
-+#if defined SHARED && IS_IN (libc)
- ENTRY_CHK (__mempcpy_chk)
- movl 12(%esp), %eax
- cmpl %eax, 16(%esp)
-diff --git a/sysdeps/i386/i686/multiarch/memcpy_chk.c b/sysdeps/i386/i686/multiarch/memcpy_chk.c
-index ec945dc91f..c3a8aeaf18 100644
---- a/sysdeps/i386/i686/multiarch/memcpy_chk.c
-+++ b/sysdeps/i386/i686/multiarch/memcpy_chk.c
-@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_memcpy_chk, __memcpy_chk,
- __hidden_ver1 (__memcpy_chk, __GI___memcpy_chk, __redirect_memcpy_chk)
- __attribute__ ((visibility ("hidden"))) __attribute_copy__ (__memcpy_chk);
- # endif
-+#else
-+# include <debug/memcpy_chk.c>
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/memmove_chk.c b/sysdeps/i386/i686/multiarch/memmove_chk.c
-index 55c7601d5d..070dde083a 100644
---- a/sysdeps/i386/i686/multiarch/memmove_chk.c
-+++ b/sysdeps/i386/i686/multiarch/memmove_chk.c
-@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_memmove_chk, __memmove_chk,
- __hidden_ver1 (__memmove_chk, __GI___memmove_chk, __redirect_memmove_chk)
- __attribute__ ((visibility ("hidden"))) __attribute_copy__ (__memmove_chk);
- # endif
-+#else
-+# include <debug/memmove_chk.c>
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.c b/sysdeps/i386/i686/multiarch/mempcpy_chk.c
-index 83569cf9d9..14360f1828 100644
---- a/sysdeps/i386/i686/multiarch/mempcpy_chk.c
-+++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.c
-@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_mempcpy_chk, __mempcpy_chk,
- __hidden_ver1 (__mempcpy_chk, __GI___mempcpy_chk, __redirect_mempcpy_chk)
- __attribute__ ((visibility ("hidden"))) __attribute_copy__ (__mempcpy_chk);
- # endif
-+#else
-+# include <debug/mempcpy_chk.c>
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/memset_chk.c b/sysdeps/i386/i686/multiarch/memset_chk.c
-index 1a7503858d..8179ef7c0b 100644
---- a/sysdeps/i386/i686/multiarch/memset_chk.c
-+++ b/sysdeps/i386/i686/multiarch/memset_chk.c
-@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_memset_chk, __memset_chk,
- __hidden_ver1 (__memset_chk, __GI___memset_chk, __redirect_memset_chk)
- __attribute__ ((visibility ("hidden"))) __attribute_copy__ (__memset_chk);
- # endif
-+#else
-+# include <debug/memset_chk.c>
- #endif
---
-2.39.2
-
+++ /dev/null
-From 98c293c61f770b6b7a22f89a6ea81b711ecb1952 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 11 Aug 2023 11:18:17 +0200
-Subject: [PATCH 07/27] malloc: Enable merging of remainders in memalign (bug
- 30723)
-
-Previously, calling _int_free from _int_memalign could put remainders
-into the tcache or into fastbins, where they are invisible to the
-low-level allocator. This results in missed merge opportunities
-because once these freed chunks become available to the low-level
-allocator, further memalign allocations (even of the same size are)
-likely obstructing merges.
-
-Furthermore, during forwards merging in _int_memalign, do not
-completely give up when the remainder is too small to serve as a
-chunk on its own. We can still give it back if it can be merged
-with the following unused chunk. This makes it more likely that
-memalign calls in a loop achieve a compact memory layout,
-independently of initial heap layout.
-
-Drop some useless (unsigned long) casts along the way, and tweak
-the style to more closely match GNU on changed lines.
-
-Reviewed-by: DJ Delorie <dj@redhat.com>
-(cherry picked from commit 542b1105852568c3ebc712225ae78b8c8ba31a78)
----
- malloc/malloc.c | 197 +++++++++++++++++++++++++++++-------------------
- 1 file changed, 121 insertions(+), 76 deletions(-)
-
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index e2f1a615a4..948f9759af 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -1086,6 +1086,11 @@ typedef struct malloc_chunk* mchunkptr;
-
- static void* _int_malloc(mstate, size_t);
- static void _int_free(mstate, mchunkptr, int);
-+static void _int_free_merge_chunk (mstate, mchunkptr, INTERNAL_SIZE_T);
-+static INTERNAL_SIZE_T _int_free_create_chunk (mstate,
-+ mchunkptr, INTERNAL_SIZE_T,
-+ mchunkptr, INTERNAL_SIZE_T);
-+static void _int_free_maybe_consolidate (mstate, INTERNAL_SIZE_T);
- static void* _int_realloc(mstate, mchunkptr, INTERNAL_SIZE_T,
- INTERNAL_SIZE_T);
- static void* _int_memalign(mstate, size_t, size_t);
-@@ -4637,31 +4642,52 @@ _int_free (mstate av, mchunkptr p, int have_lock)
- if (!have_lock)
- __libc_lock_lock (av->mutex);
-
-- nextchunk = chunk_at_offset(p, size);
--
-- /* Lightweight tests: check whether the block is already the
-- top block. */
-- if (__glibc_unlikely (p == av->top))
-- malloc_printerr ("double free or corruption (top)");
-- /* Or whether the next chunk is beyond the boundaries of the arena. */
-- if (__builtin_expect (contiguous (av)
-- && (char *) nextchunk
-- >= ((char *) av->top + chunksize(av->top)), 0))
-- malloc_printerr ("double free or corruption (out)");
-- /* Or whether the block is actually not marked used. */
-- if (__glibc_unlikely (!prev_inuse(nextchunk)))
-- malloc_printerr ("double free or corruption (!prev)");
--
-- nextsize = chunksize(nextchunk);
-- if (__builtin_expect (chunksize_nomask (nextchunk) <= CHUNK_HDR_SZ, 0)
-- || __builtin_expect (nextsize >= av->system_mem, 0))
-- malloc_printerr ("free(): invalid next size (normal)");
-+ _int_free_merge_chunk (av, p, size);
-
-- free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ);
-+ if (!have_lock)
-+ __libc_lock_unlock (av->mutex);
-+ }
-+ /*
-+ If the chunk was allocated via mmap, release via munmap().
-+ */
-+
-+ else {
-+ munmap_chunk (p);
-+ }
-+}
-+
-+/* Try to merge chunk P of SIZE bytes with its neighbors. Put the
-+ resulting chunk on the appropriate bin list. P must not be on a
-+ bin list yet, and it can be in use. */
-+static void
-+_int_free_merge_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T size)
-+{
-+ mchunkptr nextchunk = chunk_at_offset(p, size);
-+
-+ /* Lightweight tests: check whether the block is already the
-+ top block. */
-+ if (__glibc_unlikely (p == av->top))
-+ malloc_printerr ("double free or corruption (top)");
-+ /* Or whether the next chunk is beyond the boundaries of the arena. */
-+ if (__builtin_expect (contiguous (av)
-+ && (char *) nextchunk
-+ >= ((char *) av->top + chunksize(av->top)), 0))
-+ malloc_printerr ("double free or corruption (out)");
-+ /* Or whether the block is actually not marked used. */
-+ if (__glibc_unlikely (!prev_inuse(nextchunk)))
-+ malloc_printerr ("double free or corruption (!prev)");
-+
-+ INTERNAL_SIZE_T nextsize = chunksize(nextchunk);
-+ if (__builtin_expect (chunksize_nomask (nextchunk) <= CHUNK_HDR_SZ, 0)
-+ || __builtin_expect (nextsize >= av->system_mem, 0))
-+ malloc_printerr ("free(): invalid next size (normal)");
-+
-+ free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ);
-
-- /* consolidate backward */
-- if (!prev_inuse(p)) {
-- prevsize = prev_size (p);
-+ /* Consolidate backward. */
-+ if (!prev_inuse(p))
-+ {
-+ INTERNAL_SIZE_T prevsize = prev_size (p);
- size += prevsize;
- p = chunk_at_offset(p, -((long) prevsize));
- if (__glibc_unlikely (chunksize(p) != prevsize))
-@@ -4669,9 +4695,25 @@ _int_free (mstate av, mchunkptr p, int have_lock)
- unlink_chunk (av, p);
- }
-
-- if (nextchunk != av->top) {
-+ /* Write the chunk header, maybe after merging with the following chunk. */
-+ size = _int_free_create_chunk (av, p, size, nextchunk, nextsize);
-+ _int_free_maybe_consolidate (av, size);
-+}
-+
-+/* Create a chunk at P of SIZE bytes, with SIZE potentially increased
-+ to cover the immediately following chunk NEXTCHUNK of NEXTSIZE
-+ bytes (if NEXTCHUNK is unused). The chunk at P is not actually
-+ read and does not have to be initialized. After creation, it is
-+ placed on the appropriate bin list. The function returns the size
-+ of the new chunk. */
-+static INTERNAL_SIZE_T
-+_int_free_create_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T size,
-+ mchunkptr nextchunk, INTERNAL_SIZE_T nextsize)
-+{
-+ if (nextchunk != av->top)
-+ {
- /* get and clear inuse bit */
-- nextinuse = inuse_bit_at_offset(nextchunk, nextsize);
-+ bool nextinuse = inuse_bit_at_offset (nextchunk, nextsize);
-
- /* consolidate forward */
- if (!nextinuse) {
-@@ -4686,8 +4728,8 @@ _int_free (mstate av, mchunkptr p, int have_lock)
- been given one chance to be used in malloc.
- */
-
-- bck = unsorted_chunks(av);
-- fwd = bck->fd;
-+ mchunkptr bck = unsorted_chunks (av);
-+ mchunkptr fwd = bck->fd;
- if (__glibc_unlikely (fwd->bk != bck))
- malloc_printerr ("free(): corrupted unsorted chunks");
- p->fd = fwd;
-@@ -4706,61 +4748,52 @@ _int_free (mstate av, mchunkptr p, int have_lock)
- check_free_chunk(av, p);
- }
-
-- /*
-- If the chunk borders the current high end of memory,
-- consolidate into top
-- */
--
-- else {
-+ else
-+ {
-+ /* If the chunk borders the current high end of memory,
-+ consolidate into top. */
- size += nextsize;
- set_head(p, size | PREV_INUSE);
- av->top = p;
- check_chunk(av, p);
- }
-
-- /*
-- If freeing a large space, consolidate possibly-surrounding
-- chunks. Then, if the total unused topmost memory exceeds trim
-- threshold, ask malloc_trim to reduce top.
--
-- Unless max_fast is 0, we don't know if there are fastbins
-- bordering top, so we cannot tell for sure whether threshold
-- has been reached unless fastbins are consolidated. But we
-- don't want to consolidate on each free. As a compromise,
-- consolidation is performed if FASTBIN_CONSOLIDATION_THRESHOLD
-- is reached.
-- */
-+ return size;
-+}
-
-- if ((unsigned long)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD) {
-+/* If freeing a large space, consolidate possibly-surrounding
-+ chunks. Then, if the total unused topmost memory exceeds trim
-+ threshold, ask malloc_trim to reduce top. */
-+static void
-+_int_free_maybe_consolidate (mstate av, INTERNAL_SIZE_T size)
-+{
-+ /* Unless max_fast is 0, we don't know if there are fastbins
-+ bordering top, so we cannot tell for sure whether threshold has
-+ been reached unless fastbins are consolidated. But we don't want
-+ to consolidate on each free. As a compromise, consolidation is
-+ performed if FASTBIN_CONSOLIDATION_THRESHOLD is reached. */
-+ if (size >= FASTBIN_CONSOLIDATION_THRESHOLD)
-+ {
- if (atomic_load_relaxed (&av->have_fastchunks))
- malloc_consolidate(av);
-
-- if (av == &main_arena) {
-+ if (av == &main_arena)
-+ {
- #ifndef MORECORE_CANNOT_TRIM
-- if ((unsigned long)(chunksize(av->top)) >=
-- (unsigned long)(mp_.trim_threshold))
-- systrim(mp_.top_pad, av);
-+ if (chunksize (av->top) >= mp_.trim_threshold)
-+ systrim (mp_.top_pad, av);
- #endif
-- } else {
-- /* Always try heap_trim(), even if the top chunk is not
-- large, because the corresponding heap might go away. */
-- heap_info *heap = heap_for_ptr(top(av));
-+ }
-+ else
-+ {
-+ /* Always try heap_trim, even if the top chunk is not large,
-+ because the corresponding heap might go away. */
-+ heap_info *heap = heap_for_ptr (top (av));
-
-- assert(heap->ar_ptr == av);
-- heap_trim(heap, mp_.top_pad);
-- }
-+ assert (heap->ar_ptr == av);
-+ heap_trim (heap, mp_.top_pad);
-+ }
- }
--
-- if (!have_lock)
-- __libc_lock_unlock (av->mutex);
-- }
-- /*
-- If the chunk was allocated via mmap, release via munmap().
-- */
--
-- else {
-- munmap_chunk (p);
-- }
- }
-
- /*
-@@ -5221,7 +5254,7 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
- (av != &main_arena ? NON_MAIN_ARENA : 0));
- set_inuse_bit_at_offset (newp, newsize);
- set_head_size (p, leadsize | (av != &main_arena ? NON_MAIN_ARENA : 0));
-- _int_free (av, p, 1);
-+ _int_free_merge_chunk (av, p, leadsize);
- p = newp;
-
- assert (newsize >= nb &&
-@@ -5232,15 +5265,27 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
- if (!chunk_is_mmapped (p))
- {
- size = chunksize (p);
-- if ((unsigned long) (size) > (unsigned long) (nb + MINSIZE))
-+ mchunkptr nextchunk = chunk_at_offset(p, size);
-+ INTERNAL_SIZE_T nextsize = chunksize(nextchunk);
-+ if (size > nb)
- {
- remainder_size = size - nb;
-- remainder = chunk_at_offset (p, nb);
-- set_head (remainder, remainder_size | PREV_INUSE |
-- (av != &main_arena ? NON_MAIN_ARENA : 0));
-- set_head_size (p, nb);
-- _int_free (av, remainder, 1);
-- }
-+ if (remainder_size >= MINSIZE
-+ || nextchunk == av->top
-+ || !inuse_bit_at_offset (nextchunk, nextsize))
-+ {
-+ /* We can only give back the tail if it is larger than
-+ MINSIZE, or if the following chunk is unused (top
-+ chunk or unused in-heap chunk). Otherwise we would
-+ create a chunk that is smaller than MINSIZE. */
-+ remainder = chunk_at_offset (p, nb);
-+ set_head_size (p, nb);
-+ remainder_size = _int_free_create_chunk (av, remainder,
-+ remainder_size,
-+ nextchunk, nextsize);
-+ _int_free_maybe_consolidate (av, remainder_size);
-+ }
-+ }
- }
-
- check_inuse_chunk (av, p);
---
-2.39.2
-
+++ /dev/null
-From 2af141bda3cd407abd4bedf615f9e45fe79518e2 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Thu, 10 Aug 2023 19:36:56 +0200
-Subject: [PATCH 08/27] malloc: Remove bin scanning from memalign (bug 30723)
-
-On the test workload (mpv --cache=yes with VP9 video decoding), the
-bin scanning has a very poor success rate (less than 2%). The tcache
-scanning has about 50% success rate, so keep that.
-
-Update comments in malloc/tst-memalign-2 to indicate the purpose
-of the tests. Even with the scanning removed, the additional
-merging opportunities since commit 542b1105852568c3ebc712225ae78b
-("malloc: Enable merging of remainders in memalign (bug 30723)")
-are sufficient to pass the existing large bins test.
-
-Remove leftover variables from _int_free from refactoring in the
-same commit.
-
-Reviewed-by: DJ Delorie <dj@redhat.com>
-(cherry picked from commit 0dc7fc1cf094406a138e4d1bcf9553e59edcf89d)
----
- NEWS | 1 +
- malloc/malloc.c | 169 ++--------------------------------------
- malloc/tst-memalign-2.c | 7 +-
- 3 files changed, 11 insertions(+), 166 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 872bc8907b..c339cb444e 100644
---- a/NEWS
-+++ b/NEWS
-@@ -132,6 +132,7 @@ The following bugs are resolved with this release:
- [30555] string: strerror can incorrectly return NULL
- [30579] malloc: trim_threshold in realloc lead to high memory usage
- [30662] nscd: Group and password cache use errno in place of errval
-+ [30723] posix_memalign repeatedly scans long bin lists
- \f
- Version 2.37
-
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 948f9759af..d0bbbf3710 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -4488,12 +4488,6 @@ _int_free (mstate av, mchunkptr p, int have_lock)
- {
- INTERNAL_SIZE_T size; /* its size */
- mfastbinptr *fb; /* associated fastbin */
-- mchunkptr nextchunk; /* next contiguous chunk */
-- INTERNAL_SIZE_T nextsize; /* its size */
-- int nextinuse; /* true if nextchunk is used */
-- INTERNAL_SIZE_T prevsize; /* size of previous contiguous chunk */
-- mchunkptr bck; /* misc temp for linking */
-- mchunkptr fwd; /* misc temp for linking */
-
- size = chunksize (p);
-
-@@ -5032,42 +5026,6 @@ _int_realloc (mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
- ------------------------------ memalign ------------------------------
- */
-
--/* Returns 0 if the chunk is not and does not contain the requested
-- aligned sub-chunk, else returns the amount of "waste" from
-- trimming. NB is the *chunk* byte size, not the user byte
-- size. */
--static size_t
--chunk_ok_for_memalign (mchunkptr p, size_t alignment, size_t nb)
--{
-- void *m = chunk2mem (p);
-- INTERNAL_SIZE_T size = chunksize (p);
-- void *aligned_m = m;
--
-- if (__glibc_unlikely (misaligned_chunk (p)))
-- malloc_printerr ("_int_memalign(): unaligned chunk detected");
--
-- aligned_m = PTR_ALIGN_UP (m, alignment);
--
-- INTERNAL_SIZE_T front_extra = (intptr_t) aligned_m - (intptr_t) m;
--
-- /* We can't trim off the front as it's too small. */
-- if (front_extra > 0 && front_extra < MINSIZE)
-- return 0;
--
-- /* If it's a perfect fit, it's an exception to the return value rule
-- (we would return zero waste, which looks like "not usable"), so
-- handle it here by returning a small non-zero value instead. */
-- if (size == nb && front_extra == 0)
-- return 1;
--
-- /* If the block we need fits in the chunk, calculate total waste. */
-- if (size > nb + front_extra)
-- return size - nb;
--
-- /* Can't use this chunk. */
-- return 0;
--}
--
- /* BYTES is user requested bytes, not requested chunksize bytes. */
- static void *
- _int_memalign (mstate av, size_t alignment, size_t bytes)
-@@ -5082,7 +5040,6 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
- mchunkptr remainder; /* spare room at end to split off */
- unsigned long remainder_size; /* its size */
- INTERNAL_SIZE_T size;
-- mchunkptr victim;
-
- nb = checked_request2size (bytes);
- if (nb == 0)
-@@ -5101,129 +5058,13 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
- we don't find anything in those bins, the common malloc code will
- scan starting at 2x. */
-
-- /* This will be set if we found a candidate chunk. */
-- victim = NULL;
--
-- /* Fast bins are singly-linked, hard to remove a chunk from the middle
-- and unlikely to meet our alignment requirements. We have not done
-- any experimentation with searching for aligned fastbins. */
--
-- if (av != NULL)
-- {
-- int first_bin_index;
-- int first_largebin_index;
-- int last_bin_index;
--
-- if (in_smallbin_range (nb))
-- first_bin_index = smallbin_index (nb);
-- else
-- first_bin_index = largebin_index (nb);
--
-- if (in_smallbin_range (nb * 2))
-- last_bin_index = smallbin_index (nb * 2);
-- else
-- last_bin_index = largebin_index (nb * 2);
--
-- first_largebin_index = largebin_index (MIN_LARGE_SIZE);
--
-- int victim_index; /* its bin index */
--
-- for (victim_index = first_bin_index;
-- victim_index < last_bin_index;
-- victim_index ++)
-- {
-- victim = NULL;
--
-- if (victim_index < first_largebin_index)
-- {
-- /* Check small bins. Small bin chunks are doubly-linked despite
-- being the same size. */
--
-- mchunkptr fwd; /* misc temp for linking */
-- mchunkptr bck; /* misc temp for linking */
--
-- bck = bin_at (av, victim_index);
-- fwd = bck->fd;
-- while (fwd != bck)
-- {
-- if (chunk_ok_for_memalign (fwd, alignment, nb) > 0)
-- {
-- victim = fwd;
--
-- /* Unlink it */
-- victim->fd->bk = victim->bk;
-- victim->bk->fd = victim->fd;
-- break;
-- }
--
-- fwd = fwd->fd;
-- }
-- }
-- else
-- {
-- /* Check large bins. */
-- mchunkptr fwd; /* misc temp for linking */
-- mchunkptr bck; /* misc temp for linking */
-- mchunkptr best = NULL;
-- size_t best_size = 0;
--
-- bck = bin_at (av, victim_index);
-- fwd = bck->fd;
-+ /* Call malloc with worst case padding to hit alignment. */
-+ m = (char *) (_int_malloc (av, nb + alignment + MINSIZE));
-
-- while (fwd != bck)
-- {
-- int extra;
--
-- if (chunksize (fwd) < nb)
-- break;
-- extra = chunk_ok_for_memalign (fwd, alignment, nb);
-- if (extra > 0
-- && (extra <= best_size || best == NULL))
-- {
-- best = fwd;
-- best_size = extra;
-- }
-+ if (m == 0)
-+ return 0; /* propagate failure */
-
-- fwd = fwd->fd;
-- }
-- victim = best;
--
-- if (victim != NULL)
-- {
-- unlink_chunk (av, victim);
-- break;
-- }
-- }
--
-- if (victim != NULL)
-- break;
-- }
-- }
--
-- /* Strategy: find a spot within that chunk that meets the alignment
-- request, and then possibly free the leading and trailing space.
-- This strategy is incredibly costly and can lead to external
-- fragmentation if header and footer chunks are unused. */
--
-- if (victim != NULL)
-- {
-- p = victim;
-- m = chunk2mem (p);
-- set_inuse (p);
-- if (av != &main_arena)
-- set_non_main_arena (p);
-- }
-- else
-- {
-- /* Call malloc with worst case padding to hit alignment. */
--
-- m = (char *) (_int_malloc (av, nb + alignment + MINSIZE));
--
-- if (m == 0)
-- return 0; /* propagate failure */
--
-- p = mem2chunk (m);
-- }
-+ p = mem2chunk (m);
-
- if ((((unsigned long) (m)) % alignment) != 0) /* misaligned */
- {
-diff --git a/malloc/tst-memalign-2.c b/malloc/tst-memalign-2.c
-index f229283dbf..ecd6fa249e 100644
---- a/malloc/tst-memalign-2.c
-+++ b/malloc/tst-memalign-2.c
-@@ -86,7 +86,8 @@ do_test (void)
- TEST_VERIFY (tcache_allocs[i].ptr1 == tcache_allocs[i].ptr2);
- }
-
-- /* Test for non-head tcache hits. */
-+ /* Test for non-head tcache hits. This exercises the memalign
-+ scanning code to find matching allocations. */
- for (i = 0; i < array_length (ptr); ++ i)
- {
- if (i == 4)
-@@ -113,7 +114,9 @@ do_test (void)
- free (p);
- TEST_VERIFY (count > 0);
-
-- /* Large bins test. */
-+ /* Large bins test. This verifies that the over-allocated parts
-+ that memalign releases for future allocations can be reused by
-+ memalign itself at least in some cases. */
-
- for (i = 0; i < LN; ++ i)
- {
---
-2.39.2
-
+++ /dev/null
-From c8ecda6251dd4a0dfe074e0a6011211cadeef742 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 4 Aug 2023 23:58:27 +0100
-Subject: [PATCH 09/27] sysdeps: tst-bz21269: fix test parameter
-
-All callers pass 1 or 0x11 anyway (same meaning according to man page),
-but still.
-
-Reviewed-by: DJ Delorie <dj@redhat.com>
-Signed-off-by: Sam James <sam@gentoo.org>
-(cherry picked from commit e0b712dd9183d527aae4506cd39564c14af3bb28)
----
- sysdeps/unix/sysv/linux/i386/tst-bz21269.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-index 51d4a1b082..f508ef8f16 100644
---- a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-+++ b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-@@ -52,7 +52,7 @@ xset_thread_area (struct user_desc *u_info)
- static void
- xmodify_ldt (int func, const void *ptr, unsigned long bytecount)
- {
-- TEST_VERIFY_EXIT (syscall (SYS_modify_ldt, 1, ptr, bytecount) == 0);
-+ TEST_VERIFY_EXIT (syscall (SYS_modify_ldt, func, ptr, bytecount) == 0);
- }
-
- static int
---
-2.39.2
-
+++ /dev/null
-From ad9b8399537670a990572c4b0c4da5411e3b68cf Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 5 Aug 2023 00:04:33 +0100
-Subject: [PATCH 10/27] sysdeps: tst-bz21269: handle ENOSYS & skip
- appropriately
-
-SYS_modify_ldt requires CONFIG_MODIFY_LDT_SYSCALL to be set in the kernel, which
-some distributions may disable for hardening. Check if that's the case (unset)
-and mark the test as UNSUPPORTED if so.
-
-Reviewed-by: DJ Delorie <dj@redhat.com>
-Signed-off-by: Sam James <sam@gentoo.org>
-(cherry picked from commit 652b9fdb77d9fd056d4dd26dad2c14142768ab49)
----
- sysdeps/unix/sysv/linux/i386/tst-bz21269.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-index f508ef8f16..28f5359bea 100644
---- a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-+++ b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-@@ -52,7 +52,16 @@ xset_thread_area (struct user_desc *u_info)
- static void
- xmodify_ldt (int func, const void *ptr, unsigned long bytecount)
- {
-- TEST_VERIFY_EXIT (syscall (SYS_modify_ldt, func, ptr, bytecount) == 0);
-+ long ret = syscall (SYS_modify_ldt, func, ptr, bytecount);
-+
-+ if (ret == -1)
-+ {
-+ if (errno == ENOSYS)
-+ FAIL_UNSUPPORTED ("modify_ldt not supported");
-+ FAIL_EXIT1 ("modify_ldt failed (errno=%d)", errno);
-+ }
-+
-+ return 0;
- }
-
- static int
---
-2.39.2
-
+++ /dev/null
-From 1aed90c9c8f8be9f68b58e96b6e4cd0fc08eb2b1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 17 Aug 2023 09:30:29 +0100
-Subject: [PATCH 11/27] sysdeps: tst-bz21269: fix -Wreturn-type
-
-Thanks to Andreas Schwab for reporting.
-
-Fixes: 652b9fdb77d9fd056d4dd26dad2c14142768ab49
-Signed-off-by: Sam James <sam@gentoo.org>
-(cherry picked from commit 369f373057073c307938da91af16922bda3dff6a)
----
- sysdeps/unix/sysv/linux/i386/tst-bz21269.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-index 28f5359bea..822c41fceb 100644
---- a/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-+++ b/sysdeps/unix/sysv/linux/i386/tst-bz21269.c
-@@ -60,8 +60,6 @@ xmodify_ldt (int func, const void *ptr, unsigned long bytecount)
- FAIL_UNSUPPORTED ("modify_ldt not supported");
- FAIL_EXIT1 ("modify_ldt failed (errno=%d)", errno);
- }
--
-- return 0;
- }
-
- static int
---
-2.39.2
-
+++ /dev/null
-From 5bdef6f27c91f45505ed5444147be4ed0e9bc3c7 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Mon, 28 Aug 2023 23:30:37 +0200
-Subject: [PATCH 12/27] io: Fix record locking contants for powerpc64 with
- __USE_FILE_OFFSET64
-
-Commit 5f828ff824e3b7cd1 ("io: Fix F_GETLK, F_SETLK, and F_SETLKW for
-powerpc64") fixed an issue with the value of the lock constants on
-powerpc64 when not using __USE_FILE_OFFSET64, but it ended-up also
-changing the value when using __USE_FILE_OFFSET64 causing an API change.
-
-Fix that by also checking that define, restoring the pre
-4d0fe291aed3a476a commit values:
-
-Default values:
-- F_GETLK: 5
-- F_SETLK: 6
-- F_SETLKW: 7
-
-With -D_FILE_OFFSET_BITS=64:
-- F_GETLK: 12
-- F_SETLK: 13
-- F_SETLKW: 14
-
-At the same time, it has been noticed that there was no test for io lock
-with __USE_FILE_OFFSET64, so just add one.
-
-Tested on x86_64-linux-gnu, i686-linux-gnu and
-powerpc64le-unknown-linux-gnu.
-
-Resolves: BZ #30804.
-Co-authored-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-(cherry picked from commit 434bf72a94de68f0cc7fbf3c44bf38c1911b70cb)
----
- NEWS | 2 ++
- io/Makefile | 1 +
- io/tst-fcntl-lock-lfs.c | 2 ++
- sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 2 +-
- 4 files changed, 6 insertions(+), 1 deletion(-)
- create mode 100644 io/tst-fcntl-lock-lfs.c
-
-diff --git a/NEWS b/NEWS
-index c339cb444e..8156572cdf 100644
---- a/NEWS
-+++ b/NEWS
-@@ -133,6 +133,8 @@ The following bugs are resolved with this release:
- [30579] malloc: trim_threshold in realloc lead to high memory usage
- [30662] nscd: Group and password cache use errno in place of errval
- [30723] posix_memalign repeatedly scans long bin lists
-+ [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
-+ -D_FILE_OFFSET_BITS=64
- \f
- Version 2.37
-
-diff --git a/io/Makefile b/io/Makefile
-index 6ccc0e8691..8a3c83a3bb 100644
---- a/io/Makefile
-+++ b/io/Makefile
-@@ -192,6 +192,7 @@ tests := \
- tst-fchownat \
- tst-fcntl \
- tst-fcntl-lock \
-+ tst-fcntl-lock-lfs \
- tst-fstatat \
- tst-fts \
- tst-fts-lfs \
-diff --git a/io/tst-fcntl-lock-lfs.c b/io/tst-fcntl-lock-lfs.c
-new file mode 100644
-index 0000000000..f2a909fb02
---- /dev/null
-+++ b/io/tst-fcntl-lock-lfs.c
-@@ -0,0 +1,2 @@
-+#define _FILE_OFFSET_BITS 64
-+#include <io/tst-fcntl-lock.c>
-diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-index f7615a447e..d8a291a331 100644
---- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-@@ -33,7 +33,7 @@
- # define __O_LARGEFILE 0200000
- #endif
-
--#if __WORDSIZE == 64
-+#if __WORDSIZE == 64 && !defined __USE_FILE_OFFSET64
- # define F_GETLK 5
- # define F_SETLK 6
- # define F_SETLKW 7
---
-2.39.2
-
+++ /dev/null
-From 92201f16cbcfd9eafe314ef6654be2ea7ba25675 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 8 Sep 2023 15:55:19 -0400
-Subject: [PATCH 13/27] libio: Fix oversized __io_vtables
-
-IO_VTABLES_LEN is the size of the struct array in bytes, not the number
-of __IO_jump_t's in the array. Drops just under 384kb from .rodata on
-LP64 machines.
-
-Fixes: 3020f72618e ("libio: Remove the usage of __libc_IO_vtables")
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-Reviewed-by: Florian Weimer <fweimer@redhat.com>
-Tested-by: Florian Weimer <fweimer@redhat.com>
-(cherry picked from commit 8cb69e054386f980f9ff4d93b157861d72b2019e)
----
- libio/vtables.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libio/vtables.c b/libio/vtables.c
-index 1d8ad612e9..34f7e15f1c 100644
---- a/libio/vtables.c
-+++ b/libio/vtables.c
-@@ -20,6 +20,7 @@
- #include <libioP.h>
- #include <stdio.h>
- #include <ldsodefs.h>
-+#include <array_length.h>
- #include <pointer_guard.h>
- #include <libio-macros.h>
-
-@@ -88,7 +89,7 @@
- # pragma weak __wprintf_buffer_as_file_xsputn
- #endif
-
--const struct _IO_jump_t __io_vtables[IO_VTABLES_LEN] attribute_relro =
-+const struct _IO_jump_t __io_vtables[] attribute_relro =
- {
- /* _IO_str_jumps */
- [IO_STR_JUMPS] =
-@@ -485,6 +486,8 @@ const struct _IO_jump_t __io_vtables[IO_VTABLES_LEN] attribute_relro =
- },
- #endif
- };
-+_Static_assert (array_length (__io_vtables) == IO_VTABLES_NUM,
-+ "initializer count");
-
- #ifdef SHARED
-
---
-2.39.2
-
+++ /dev/null
-From 7ae211a01b085d0bde54bd13b887ce8f9d57c2b4 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 22 Aug 2023 13:56:25 +0200
-Subject: [PATCH 14/27] elf: Do not run constructors for proxy objects
-
-Otherwise, the ld.so constructor runs for each audit namespace
-and each dlmopen namespace.
-
-(cherry picked from commit f6c8204fd7fabf0cf4162eaf10ccf23258e4d10e)
----
- elf/dl-init.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/elf/dl-init.c b/elf/dl-init.c
-index 5b0732590f..ba4d2fdc85 100644
---- a/elf/dl-init.c
-+++ b/elf/dl-init.c
-@@ -25,10 +25,14 @@
- static void
- call_init (struct link_map *l, int argc, char **argv, char **env)
- {
-+ /* Do not run constructors for proxy objects. */
-+ if (l != l->l_real)
-+ return;
-+
- /* If the object has not been relocated, this is a bug. The
- function pointers are invalid in this case. (Executables do not
-- need relocation, and neither do proxy objects.) */
-- assert (l->l_real->l_relocated || l->l_real->l_type == lt_executable);
-+ need relocation.) */
-+ assert (l->l_relocated || l->l_type == lt_executable);
-
- if (l->l_init_called)
- /* This object is all done. */
---
-2.39.2
-
+++ /dev/null
-From a3189f66a5f2fe86568286fa025fa153be04c6c0 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 8 Sep 2023 12:32:14 +0200
-Subject: [PATCH 15/27] elf: Always call destructors in reverse constructor
- order (bug 30785)
-
-The current implementation of dlclose (and process exit) re-sorts the
-link maps before calling ELF destructors. Destructor order is not the
-reverse of the constructor order as a result: The second sort takes
-relocation dependencies into account, and other differences can result
-from ambiguous inputs, such as cycles. (The force_first handling in
-_dl_sort_maps is not effective for dlclose.) After the changes in
-this commit, there is still a required difference due to
-dlopen/dlclose ordering by the application, but the previous
-discrepancies went beyond that.
-
-A new global (namespace-spanning) list of link maps,
-_dl_init_called_list, is updated right before ELF constructors are
-called from _dl_init.
-
-In dl_close_worker, the maps variable, an on-stack variable length
-array, is eliminated. (VLAs are problematic, and dlclose should not
-call malloc because it cannot readily deal with malloc failure.)
-Marking still-used objects uses the namespace list directly, with
-next and next_idx replacing the done_index variable.
-
-After marking, _dl_init_called_list is used to call the destructors
-of now-unused maps in reverse destructor order. These destructors
-can call dlopen. Previously, new objects do not have l_map_used set.
-This had to change: There is no copy of the link map list anymore,
-so processing would cover newly opened (and unmarked) mappings,
-unloading them. Now, _dl_init (indirectly) sets l_map_used, too.
-(dlclose is handled by the existing reentrancy guard.)
-
-After _dl_init_called_list traversal, two more loops follow. The
-processing order changes to the original link map order in the
-namespace. Previously, dependency order was used. The difference
-should not matter because relocation dependencies could already
-reorder link maps in the old code.
-
-The changes to _dl_fini remove the sorting step and replace it with
-a traversal of _dl_init_called_list. The l_direct_opencount
-decrement outside the loader lock is removed because it appears
-incorrect: the counter manipulation could race with other dynamic
-loader operations.
-
-tst-audit23 needs adjustments to the changes in LA_ACT_DELETE
-notifications. The new approach for checking la_activity should
-make it clearer that la_activty calls come in pairs around namespace
-updates.
-
-The dependency sorting test cases need updates because the destructor
-order is always the opposite order of constructor order, even with
-relocation dependencies or cycles present.
-
-There is a future cleanup opportunity to remove the now-constant
-force_first and for_fini arguments from the _dl_sort_maps function.
-
-Fixes commit 1df71d32fe5f5905ffd5d100e5e9ca8ad62 ("elf: Implement
-force_first handling in _dl_sort_maps_dfs (bug 28937)").
-
-Reviewed-by: DJ Delorie <dj@redhat.com>
-(cherry picked from commit 6985865bc3ad5b23147ee73466583dd7fdf65892)
----
- NEWS | 7 ++
- elf/dl-close.c | 113 +++++++++++++++++----------
- elf/dl-fini.c | 152 +++++++++++++------------------------
- elf/dl-init.c | 16 ++++
- elf/dso-sort-tests-1.def | 19 ++---
- elf/tst-audit23.c | 44 ++++++-----
- include/link.h | 4 +
- sysdeps/generic/ldsodefs.h | 4 +
- 8 files changed, 186 insertions(+), 173 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 8156572cdf..f1a14f45dd 100644
---- a/NEWS
-+++ b/NEWS
-@@ -4,6 +4,13 @@ See the end for copying conditions.
-
- Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
- using `glibc' in the "product" field.
-+\f
-+Version 2.38.1
-+
-+The following bugs are resolved with this release:
-+
-+ [30785] Always call destructors in reverse constructor order
-+
- \f
- Version 2.38
-
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index b887a44888..ea62d0e601 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -138,30 +138,31 @@ _dl_close_worker (struct link_map *map, bool force)
-
- bool any_tls = false;
- const unsigned int nloaded = ns->_ns_nloaded;
-- struct link_map *maps[nloaded];
-
-- /* Run over the list and assign indexes to the link maps and enter
-- them into the MAPS array. */
-+ /* Run over the list and assign indexes to the link maps. */
- int idx = 0;
- for (struct link_map *l = ns->_ns_loaded; l != NULL; l = l->l_next)
- {
- l->l_map_used = 0;
- l->l_map_done = 0;
- l->l_idx = idx;
-- maps[idx] = l;
- ++idx;
- }
- assert (idx == nloaded);
-
-- /* Keep track of the lowest index link map we have covered already. */
-- int done_index = -1;
-- while (++done_index < nloaded)
-+ /* Keep marking link maps until no new link maps are found. */
-+ for (struct link_map *l = ns->_ns_loaded; l != NULL; )
- {
-- struct link_map *l = maps[done_index];
-+ /* next is reset to earlier link maps for remarking. */
-+ struct link_map *next = l->l_next;
-+ int next_idx = l->l_idx + 1; /* next->l_idx, but covers next == NULL. */
-
- if (l->l_map_done)
-- /* Already handled. */
-- continue;
-+ {
-+ /* Already handled. */
-+ l = next;
-+ continue;
-+ }
-
- /* Check whether this object is still used. */
- if (l->l_type == lt_loaded
-@@ -171,7 +172,10 @@ _dl_close_worker (struct link_map *map, bool force)
- acquire is sufficient and correct. */
- && atomic_load_acquire (&l->l_tls_dtor_count) == 0
- && !l->l_map_used)
-- continue;
-+ {
-+ l = next;
-+ continue;
-+ }
-
- /* We need this object and we handle it now. */
- l->l_map_used = 1;
-@@ -198,8 +202,11 @@ _dl_close_worker (struct link_map *map, bool force)
- already processed it, then we need to go back
- and process again from that point forward to
- ensure we keep all of its dependencies also. */
-- if ((*lp)->l_idx - 1 < done_index)
-- done_index = (*lp)->l_idx - 1;
-+ if ((*lp)->l_idx < next_idx)
-+ {
-+ next = *lp;
-+ next_idx = next->l_idx;
-+ }
- }
- }
-
-@@ -219,44 +226,65 @@ _dl_close_worker (struct link_map *map, bool force)
- if (!jmap->l_map_used)
- {
- jmap->l_map_used = 1;
-- if (jmap->l_idx - 1 < done_index)
-- done_index = jmap->l_idx - 1;
-+ if (jmap->l_idx < next_idx)
-+ {
-+ next = jmap;
-+ next_idx = next->l_idx;
-+ }
- }
- }
- }
-- }
-
-- /* Sort the entries. We can skip looking for the binary itself which is
-- at the front of the search list for the main namespace. */
-- _dl_sort_maps (maps, nloaded, (nsid == LM_ID_BASE), true);
-+ l = next;
-+ }
-
-- /* Call all termination functions at once. */
-- bool unload_any = false;
-- bool scope_mem_left = false;
-- unsigned int unload_global = 0;
-- unsigned int first_loaded = ~0;
-- for (unsigned int i = 0; i < nloaded; ++i)
-+ /* Call the destructors in reverse constructor order, and remove the
-+ closed link maps from the list. */
-+ for (struct link_map **init_called_head = &_dl_init_called_list;
-+ *init_called_head != NULL; )
- {
-- struct link_map *imap = maps[i];
-+ struct link_map *imap = *init_called_head;
-
-- /* All elements must be in the same namespace. */
-- assert (imap->l_ns == nsid);
--
-- if (!imap->l_map_used)
-+ /* _dl_init_called_list is global, to produce a global odering.
-+ Ignore the other namespaces (and link maps that are still used). */
-+ if (imap->l_ns != nsid || imap->l_map_used)
-+ init_called_head = &imap->l_init_called_next;
-+ else
- {
- assert (imap->l_type == lt_loaded && !imap->l_nodelete_active);
-
-- /* Call its termination function. Do not do it for
-- half-cooked objects. Temporarily disable exception
-- handling, so that errors are fatal. */
-- if (imap->l_init_called)
-+ /* _dl_init_called_list is updated at the same time as
-+ l_init_called. */
-+ assert (imap->l_init_called);
-+
-+ if (imap->l_info[DT_FINI_ARRAY] != NULL
-+ || imap->l_info[DT_FINI] != NULL)
- _dl_catch_exception (NULL, _dl_call_fini, imap);
-
- #ifdef SHARED
- /* Auditing checkpoint: we remove an object. */
- _dl_audit_objclose (imap);
- #endif
-+ /* Unlink this link map. */
-+ *init_called_head = imap->l_init_called_next;
-+ }
-+ }
-+
-+
-+ bool unload_any = false;
-+ bool scope_mem_left = false;
-+ unsigned int unload_global = 0;
-+
-+ /* For skipping un-unloadable link maps in the second loop. */
-+ struct link_map *first_loaded = ns->_ns_loaded;
-
-+ /* Iterate over the namespace to find objects to unload. Some
-+ unloadable objects may not be on _dl_init_called_list due to
-+ dlopen failure. */
-+ for (struct link_map *imap = first_loaded; imap != NULL; imap = imap->l_next)
-+ {
-+ if (!imap->l_map_used)
-+ {
- /* This object must not be used anymore. */
- imap->l_removed = 1;
-
-@@ -267,8 +295,8 @@ _dl_close_worker (struct link_map *map, bool force)
- ++unload_global;
-
- /* Remember where the first dynamically loaded object is. */
-- if (i < first_loaded)
-- first_loaded = i;
-+ if (first_loaded == NULL)
-+ first_loaded = imap;
- }
- /* Else imap->l_map_used. */
- else if (imap->l_type == lt_loaded)
-@@ -404,8 +432,8 @@ _dl_close_worker (struct link_map *map, bool force)
- imap->l_loader = NULL;
-
- /* Remember where the first dynamically loaded object is. */
-- if (i < first_loaded)
-- first_loaded = i;
-+ if (first_loaded == NULL)
-+ first_loaded = imap;
- }
- }
-
-@@ -476,10 +504,11 @@ _dl_close_worker (struct link_map *map, bool force)
-
- /* Check each element of the search list to see if all references to
- it are gone. */
-- for (unsigned int i = first_loaded; i < nloaded; ++i)
-+ for (struct link_map *imap = first_loaded; imap != NULL; )
- {
-- struct link_map *imap = maps[i];
-- if (!imap->l_map_used)
-+ if (imap->l_map_used)
-+ imap = imap->l_next;
-+ else
- {
- assert (imap->l_type == lt_loaded);
-
-@@ -690,7 +719,9 @@ _dl_close_worker (struct link_map *map, bool force)
- if (imap == GL(dl_initfirst))
- GL(dl_initfirst) = NULL;
-
-+ struct link_map *next = imap->l_next;
- free (imap);
-+ imap = next;
- }
- }
-
-diff --git a/elf/dl-fini.c b/elf/dl-fini.c
-index 9acb64f47c..e201d36651 100644
---- a/elf/dl-fini.c
-+++ b/elf/dl-fini.c
-@@ -24,116 +24,68 @@
- void
- _dl_fini (void)
- {
-- /* Lots of fun ahead. We have to call the destructors for all still
-- loaded objects, in all namespaces. The problem is that the ELF
-- specification now demands that dependencies between the modules
-- are taken into account. I.e., the destructor for a module is
-- called before the ones for any of its dependencies.
--
-- To make things more complicated, we cannot simply use the reverse
-- order of the constructors. Since the user might have loaded objects
-- using `dlopen' there are possibly several other modules with its
-- dependencies to be taken into account. Therefore we have to start
-- determining the order of the modules once again from the beginning. */
--
-- /* We run the destructors of the main namespaces last. As for the
-- other namespaces, we pick run the destructors in them in reverse
-- order of the namespace ID. */
--#ifdef SHARED
-- int do_audit = 0;
-- again:
--#endif
-- for (Lmid_t ns = GL(dl_nns) - 1; ns >= 0; --ns)
-- {
-- /* Protect against concurrent loads and unloads. */
-- __rtld_lock_lock_recursive (GL(dl_load_lock));
--
-- unsigned int nloaded = GL(dl_ns)[ns]._ns_nloaded;
-- /* No need to do anything for empty namespaces or those used for
-- auditing DSOs. */
-- if (nloaded == 0
--#ifdef SHARED
-- || GL(dl_ns)[ns]._ns_loaded->l_auditing != do_audit
--#endif
-- )
-- __rtld_lock_unlock_recursive (GL(dl_load_lock));
-- else
-- {
-+ /* Call destructors strictly in the reverse order of constructors.
-+ This causes fewer surprises than some arbitrary reordering based
-+ on new (relocation) dependencies. None of the objects are
-+ unmapped, so applications can deal with this if their DSOs remain
-+ in a consistent state after destructors have run. */
-+
-+ /* Protect against concurrent loads and unloads. */
-+ __rtld_lock_lock_recursive (GL(dl_load_lock));
-+
-+ /* Ignore objects which are opened during shutdown. */
-+ struct link_map *local_init_called_list = _dl_init_called_list;
-+
-+ for (struct link_map *l = local_init_called_list; l != NULL;
-+ l = l->l_init_called_next)
-+ /* Bump l_direct_opencount of all objects so that they
-+ are not dlclose()ed from underneath us. */
-+ ++l->l_direct_opencount;
-+
-+ /* After this point, everything linked from local_init_called_list
-+ cannot be unloaded because of the reference counter update. */
-+ __rtld_lock_unlock_recursive (GL(dl_load_lock));
-+
-+ /* Perform two passes: One for non-audit modules, one for audit
-+ modules. This way, audit modules receive unload notifications
-+ for non-audit objects, and the destructors for audit modules
-+ still run. */
- #ifdef SHARED
-- _dl_audit_activity_nsid (ns, LA_ACT_DELETE);
-+ int last_pass = GLRO(dl_naudit) > 0;
-+ Lmid_t last_ns = -1;
-+ for (int do_audit = 0; do_audit <= last_pass; ++do_audit)
- #endif
--
-- /* Now we can allocate an array to hold all the pointers and
-- copy the pointers in. */
-- struct link_map *maps[nloaded];
--
-- unsigned int i;
-- struct link_map *l;
-- assert (nloaded != 0 || GL(dl_ns)[ns]._ns_loaded == NULL);
-- for (l = GL(dl_ns)[ns]._ns_loaded, i = 0; l != NULL; l = l->l_next)
-- /* Do not handle ld.so in secondary namespaces. */
-- if (l == l->l_real)
-- {
-- assert (i < nloaded);
--
-- maps[i] = l;
-- l->l_idx = i;
-- ++i;
--
-- /* Bump l_direct_opencount of all objects so that they
-- are not dlclose()ed from underneath us. */
-- ++l->l_direct_opencount;
-- }
-- assert (ns != LM_ID_BASE || i == nloaded);
-- assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1);
-- unsigned int nmaps = i;
--
-- /* Now we have to do the sorting. We can skip looking for the
-- binary itself which is at the front of the search list for
-- the main namespace. */
-- _dl_sort_maps (maps, nmaps, (ns == LM_ID_BASE), true);
--
-- /* We do not rely on the linked list of loaded object anymore
-- from this point on. We have our own list here (maps). The
-- various members of this list cannot vanish since the open
-- count is too high and will be decremented in this loop. So
-- we release the lock so that some code which might be called
-- from a destructor can directly or indirectly access the
-- lock. */
-- __rtld_lock_unlock_recursive (GL(dl_load_lock));
--
-- /* 'maps' now contains the objects in the right order. Now
-- call the destructors. We have to process this array from
-- the front. */
-- for (i = 0; i < nmaps; ++i)
-- {
-- struct link_map *l = maps[i];
--
-- if (l->l_init_called)
-- {
-- _dl_call_fini (l);
-+ for (struct link_map *l = local_init_called_list; l != NULL;
-+ l = l->l_init_called_next)
-+ {
- #ifdef SHARED
-- /* Auditing checkpoint: another object closed. */
-- _dl_audit_objclose (l);
-+ if (GL(dl_ns)[l->l_ns]._ns_loaded->l_auditing != do_audit)
-+ continue;
-+
-+ /* Avoid back-to-back calls of _dl_audit_activity_nsid for the
-+ same namespace. */
-+ if (last_ns != l->l_ns)
-+ {
-+ if (last_ns >= 0)
-+ _dl_audit_activity_nsid (last_ns, LA_ACT_CONSISTENT);
-+ _dl_audit_activity_nsid (l->l_ns, LA_ACT_DELETE);
-+ last_ns = l->l_ns;
-+ }
- #endif
-- }
-
-- /* Correct the previous increment. */
-- --l->l_direct_opencount;
-- }
-+ /* There is no need to re-enable exceptions because _dl_fini
-+ is not called from a context where exceptions are caught. */
-+ _dl_call_fini (l);
-
- #ifdef SHARED
-- _dl_audit_activity_nsid (ns, LA_ACT_CONSISTENT);
-+ /* Auditing checkpoint: another object closed. */
-+ _dl_audit_objclose (l);
- #endif
-- }
-- }
-+ }
-
- #ifdef SHARED
-- if (! do_audit && GLRO(dl_naudit) > 0)
-- {
-- do_audit = 1;
-- goto again;
-- }
-+ if (last_ns >= 0)
-+ _dl_audit_activity_nsid (last_ns, LA_ACT_CONSISTENT);
-
- if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS))
- _dl_debug_printf ("\nruntime linker statistics:\n"
-diff --git a/elf/dl-init.c b/elf/dl-init.c
-index ba4d2fdc85..ffd05b7806 100644
---- a/elf/dl-init.c
-+++ b/elf/dl-init.c
-@@ -21,6 +21,7 @@
- #include <ldsodefs.h>
- #include <elf-initfini.h>
-
-+struct link_map *_dl_init_called_list;
-
- static void
- call_init (struct link_map *l, int argc, char **argv, char **env)
-@@ -42,6 +43,21 @@ call_init (struct link_map *l, int argc, char **argv, char **env)
- dependency. */
- l->l_init_called = 1;
-
-+ /* Help an already-running dlclose: The just-loaded object must not
-+ be removed during the current pass. (No effect if no dlclose in
-+ progress.) */
-+ l->l_map_used = 1;
-+
-+ /* Record execution before starting any initializers. This way, if
-+ the initializers themselves call dlopen, their ELF destructors
-+ will eventually be run before this object is destructed, matching
-+ that their ELF constructors have run before this object was
-+ constructed. _dl_fini uses this list for audit callbacks, so
-+ register objects on the list even if they do not have a
-+ constructor. */
-+ l->l_init_called_next = _dl_init_called_list;
-+ _dl_init_called_list = l;
-+
- /* Check for object which constructors we do not run here. */
- if (__builtin_expect (l->l_name[0], 'a') == '\0'
- && l->l_type == lt_executable)
-diff --git a/elf/dso-sort-tests-1.def b/elf/dso-sort-tests-1.def
-index 4bf9052db1..61dc54f8ae 100644
---- a/elf/dso-sort-tests-1.def
-+++ b/elf/dso-sort-tests-1.def
-@@ -53,21 +53,14 @@ tst-dso-ordering10: {}->a->b->c;soname({})=c
- output: b>a>{}<a<b
-
- # Complex example from Bugzilla #15311, under-linked and with circular
--# relocation(dynamic) dependencies. While this is technically unspecified, the
--# presumed reasonable practical behavior is for the destructor order to respect
--# the static DT_NEEDED links (here this means the a->b->c->d order).
--# The older dynamic_sort=1 algorithm does not achieve this, while the DFS-based
--# dynamic_sort=2 algorithm does, although it is still arguable whether going
--# beyond spec to do this is the right thing to do.
--# The below expected outputs are what the two algorithms currently produce
--# respectively, for regression testing purposes.
-+# relocation(dynamic) dependencies. For both sorting algorithms, the
-+# destruction order is the reverse of the construction order, and
-+# relocation dependencies are not taken into account.
- tst-bz15311: {+a;+e;+f;+g;+d;%d;-d;-g;-f;-e;-a};a->b->c->d;d=>[ba];c=>a;b=>e=>a;c=>f=>b;d=>g=>c
--output(glibc.rtld.dynamic_sort=1): {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<a<c<d<g<f<b<e];}
--output(glibc.rtld.dynamic_sort=2): {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<g<f<a<b<c<d<e];}
-+output: {+a[d>c>b>a>];+e[e>];+f[f>];+g[g>];+d[];%d(b(e(a()))a()g(c(a()f(b(e(a()))))));-d[];-g[];-f[];-e[];-a[<g<f<e<a<b<c<d];}
-
- # Test that even in the presence of dependency loops involving dlopen'ed
- # object, that object is initialized last (and not unloaded prematurely).
--# Final destructor order is indeterminate due to the cycle.
-+# Final destructor order is the opposite of constructor order.
- tst-bz28937: {+a;+b;-b;+c;%c};a->a1;a->a2;a2->a;b->b1;c->a1;c=>a1
--output(glibc.rtld.dynamic_sort=1): {+a[a2>a1>a>];+b[b1>b>];-b[<b<b1];+c[c>];%c(a1());}<a<a2<c<a1
--output(glibc.rtld.dynamic_sort=2): {+a[a2>a1>a>];+b[b1>b>];-b[<b<b1];+c[c>];%c(a1());}<a2<a<c<a1
-+output: {+a[a2>a1>a>];+b[b1>b>];-b[<b<b1];+c[c>];%c(a1());}<c<a<a1<a2
-diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c
-index bb7d66c385..503699c36a 100644
---- a/elf/tst-audit23.c
-+++ b/elf/tst-audit23.c
-@@ -98,6 +98,8 @@ do_test (int argc, char *argv[])
- char *lname;
- uintptr_t laddr;
- Lmid_t lmid;
-+ uintptr_t cookie;
-+ uintptr_t namespace;
- bool closed;
- } objs[max_objs] = { [0 ... max_objs-1] = { .closed = false } };
- size_t nobjs = 0;
-@@ -117,6 +119,9 @@ do_test (int argc, char *argv[])
- size_t buffer_length = 0;
- while (xgetline (&buffer, &buffer_length, out))
- {
-+ *strchrnul (buffer, '\n') = '\0';
-+ printf ("info: subprocess output: %s\n", buffer);
-+
- if (startswith (buffer, "la_activity: "))
- {
- uintptr_t cookie;
-@@ -125,29 +130,26 @@ do_test (int argc, char *argv[])
- &cookie);
- TEST_COMPARE (r, 2);
-
-- /* The cookie identifies the object at the head of the link map,
-- so we only add a new namespace if it changes from the previous
-- one. This works since dlmopen is the last in the test body. */
-- if (cookie != last_act_cookie && last_act_cookie != -1)
-- TEST_COMPARE (last_act, LA_ACT_CONSISTENT);
--
- if (this_act == LA_ACT_ADD && acts[nacts] != cookie)
- {
-+ /* The cookie identifies the object at the head of the
-+ link map, so we only add a new namespace if it
-+ changes from the previous one. This works since
-+ dlmopen is the last in the test body. */
-+ if (cookie != last_act_cookie && last_act_cookie != -1)
-+ TEST_COMPARE (last_act, LA_ACT_CONSISTENT);
-+
- acts[nacts++] = cookie;
- last_act_cookie = cookie;
- }
-- /* The LA_ACT_DELETE is called in the reverse order of LA_ACT_ADD
-- at program termination (if the tests adds a dlclose or a library
-- with extra dependencies this will need to be adapted). */
-+ /* LA_ACT_DELETE is called multiple times for each
-+ namespace, depending on destruction order. */
- else if (this_act == LA_ACT_DELETE)
-- {
-- last_act_cookie = acts[--nacts];
-- TEST_COMPARE (acts[nacts], cookie);
-- acts[nacts] = 0;
-- }
-+ last_act_cookie = cookie;
- else if (this_act == LA_ACT_CONSISTENT)
- {
- TEST_COMPARE (cookie, last_act_cookie);
-+ last_act_cookie = -1;
-
- /* LA_ACT_DELETE must always be followed by an la_objclose. */
- if (last_act == LA_ACT_DELETE)
-@@ -179,6 +181,8 @@ do_test (int argc, char *argv[])
- objs[nobjs].lname = lname;
- objs[nobjs].laddr = laddr;
- objs[nobjs].lmid = lmid;
-+ objs[nobjs].cookie = cookie;
-+ objs[nobjs].namespace = last_act_cookie;
- objs[nobjs].closed = false;
- nobjs++;
-
-@@ -201,6 +205,12 @@ do_test (int argc, char *argv[])
- if (strcmp (lname, objs[i].lname) == 0 && lmid == objs[i].lmid)
- {
- TEST_COMPARE (objs[i].closed, false);
-+ TEST_COMPARE (objs[i].cookie, cookie);
-+ if (objs[i].namespace == -1)
-+ /* No LA_ACT_ADD before the first la_objopen call. */
-+ TEST_COMPARE (acts[0], last_act_cookie);
-+ else
-+ TEST_COMPARE (objs[i].namespace, last_act_cookie);
- objs[i].closed = true;
- break;
- }
-@@ -209,11 +219,7 @@ do_test (int argc, char *argv[])
- /* la_objclose should be called after la_activity(LA_ACT_DELETE) for
- the closed object's namespace. */
- TEST_COMPARE (last_act, LA_ACT_DELETE);
-- if (!seen_first_objclose)
-- {
-- TEST_COMPARE (last_act_cookie, cookie);
-- seen_first_objclose = true;
-- }
-+ seen_first_objclose = true;
- }
- }
-
-diff --git a/include/link.h b/include/link.h
-index 1d74feb2bd..69bda3ed17 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -278,6 +278,10 @@ struct link_map
- /* List of object in order of the init and fini calls. */
- struct link_map **l_initfini;
-
-+ /* Linked list of objects in reverse ELF constructor execution
-+ order. Head of list is stored in _dl_init_called_list. */
-+ struct link_map *l_init_called_next;
-+
- /* List of the dependencies introduced through symbol binding. */
- struct link_map_reldeps
- {
-diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
-index e8b7359b04..9ea9389a39 100644
---- a/sysdeps/generic/ldsodefs.h
-+++ b/sysdeps/generic/ldsodefs.h
-@@ -1037,6 +1037,10 @@ extern int _dl_check_map_versions (struct link_map *map, int verbose,
- extern void _dl_init (struct link_map *main_map, int argc, char **argv,
- char **env) attribute_hidden;
-
-+/* List of ELF objects in reverse order of their constructor
-+ invocation. */
-+extern struct link_map *_dl_init_called_list attribute_hidden;
-+
- /* Call the finalizer functions of all shared objects whose
- initializer functions have completed. */
- extern void _dl_fini (void) attribute_hidden;
---
-2.39.2
-
+++ /dev/null
-From 750f19526ae71aac801c77a3f7ef5374890c09b7 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Fri, 8 Sep 2023 13:02:06 +0200
-Subject: [PATCH 16/27] elf: Remove unused l_text_end field from struct
- link_map
-
-It is a left-over from commit 52a01100ad011293197637e42b5be1a479a2
-("elf: Remove ad-hoc restrictions on dlopen callers [BZ #22787]").
-
-When backporting commmit 6985865bc3ad5b23147ee73466583dd7fdf65892
-("elf: Always call destructors in reverse constructor order
-(bug 30785)"), we can move the l_init_called_next field to this
-place, so that the internal GLIBC_PRIVATE ABI does not change.
-
-Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-Tested-by: Carlos O'Donell <carlos@redhat.com>
-(cherry picked from commit 53df2ce6885da3d0e89e87dca7b095622296014f)
----
- elf/dl-load.c | 2 +-
- elf/dl-load.h | 7 ++-----
- elf/rtld.c | 6 ------
- elf/setup-vdso.h | 4 ----
- include/link.h | 2 --
- 5 files changed, 3 insertions(+), 18 deletions(-)
-
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index 9a87fda9c9..2923b1141d 100644
---- a/elf/dl-load.c
-+++ b/elf/dl-load.c
-@@ -1253,7 +1253,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
-
- /* Now process the load commands and map segments into memory.
- This is responsible for filling in:
-- l_map_start, l_map_end, l_addr, l_contiguous, l_text_end, l_phdr
-+ l_map_start, l_map_end, l_addr, l_contiguous, l_phdr
- */
- errstring = _dl_map_segments (l, fd, header, type, loadcmds, nloadcmds,
- maplength, has_holes, loader);
-diff --git a/elf/dl-load.h b/elf/dl-load.h
-index ecf6910c68..1d5207694b 100644
---- a/elf/dl-load.h
-+++ b/elf/dl-load.h
-@@ -83,14 +83,11 @@ struct loadcmd
-
- /* This is a subroutine of _dl_map_segments. It should be called for each
- load command, some time after L->l_addr has been set correctly. It is
-- responsible for setting up the l_text_end and l_phdr fields. */
-+ responsible for setting the l_phdr fields */
- static __always_inline void
- _dl_postprocess_loadcmd (struct link_map *l, const ElfW(Ehdr) *header,
- const struct loadcmd *c)
- {
-- if (c->prot & PROT_EXEC)
-- l->l_text_end = l->l_addr + c->mapend;
--
- if (l->l_phdr == 0
- && c->mapoff <= header->e_phoff
- && ((size_t) (c->mapend - c->mapstart + c->mapoff)
-@@ -103,7 +100,7 @@ _dl_postprocess_loadcmd (struct link_map *l, const ElfW(Ehdr) *header,
-
- /* This is a subroutine of _dl_map_object_from_fd. It is responsible
- for filling in several fields in *L: l_map_start, l_map_end, l_addr,
-- l_contiguous, l_text_end, l_phdr. On successful return, all the
-+ l_contiguous, l_phdr. On successful return, all the
- segments are mapped (or copied, or whatever) from the file into their
- final places in the address space, with the correct page permissions,
- and any bss-like regions already zeroed. It returns a null pointer
-diff --git a/elf/rtld.c b/elf/rtld.c
-index a91e2a4471..5107d16fe3 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -477,7 +477,6 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
- GL(dl_rtld_map).l_real = &GL(dl_rtld_map);
- GL(dl_rtld_map).l_map_start = (ElfW(Addr)) &__ehdr_start;
- GL(dl_rtld_map).l_map_end = (ElfW(Addr)) _end;
-- GL(dl_rtld_map).l_text_end = (ElfW(Addr)) _etext;
- /* Copy the TLS related data if necessary. */
- #ifndef DONT_USE_BOOTSTRAP_MAP
- # if NO_TLS_OFFSET != 0
-@@ -1119,7 +1118,6 @@ rtld_setup_main_map (struct link_map *main_map)
- bool has_interp = false;
-
- main_map->l_map_end = 0;
-- main_map->l_text_end = 0;
- /* Perhaps the executable has no PT_LOAD header entries at all. */
- main_map->l_map_start = ~0;
- /* And it was opened directly. */
-@@ -1211,8 +1209,6 @@ rtld_setup_main_map (struct link_map *main_map)
- allocend = main_map->l_addr + ph->p_vaddr + ph->p_memsz;
- if (main_map->l_map_end < allocend)
- main_map->l_map_end = allocend;
-- if ((ph->p_flags & PF_X) && allocend > main_map->l_text_end)
-- main_map->l_text_end = allocend;
-
- /* The next expected address is the page following this load
- segment. */
-@@ -1272,8 +1268,6 @@ rtld_setup_main_map (struct link_map *main_map)
- = (char *) main_map->l_tls_initimage + main_map->l_addr;
- if (! main_map->l_map_end)
- main_map->l_map_end = ~0;
-- if (! main_map->l_text_end)
-- main_map->l_text_end = ~0;
- if (! GL(dl_rtld_map).l_libname && GL(dl_rtld_map).l_name)
- {
- /* We were invoked directly, so the program might not have a
-diff --git a/elf/setup-vdso.h b/elf/setup-vdso.h
-index 0079842d1f..d92b12a7aa 100644
---- a/elf/setup-vdso.h
-+++ b/elf/setup-vdso.h
-@@ -51,9 +51,6 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)),
- l->l_addr = ph->p_vaddr;
- if (ph->p_vaddr + ph->p_memsz >= l->l_map_end)
- l->l_map_end = ph->p_vaddr + ph->p_memsz;
-- if ((ph->p_flags & PF_X)
-- && ph->p_vaddr + ph->p_memsz >= l->l_text_end)
-- l->l_text_end = ph->p_vaddr + ph->p_memsz;
- }
- else
- /* There must be no TLS segment. */
-@@ -62,7 +59,6 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)),
- l->l_map_start = (ElfW(Addr)) GLRO(dl_sysinfo_dso);
- l->l_addr = l->l_map_start - l->l_addr;
- l->l_map_end += l->l_addr;
-- l->l_text_end += l->l_addr;
- l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr);
- elf_get_dynamic_info (l, false, false);
- _dl_setup_hash (l);
-diff --git a/include/link.h b/include/link.h
-index 69bda3ed17..c6af095d87 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -253,8 +253,6 @@ struct link_map
- /* Start and finish of memory map for this object. l_map_start
- need not be the same as l_addr. */
- ElfW(Addr) l_map_start, l_map_end;
-- /* End of the executable part of the mapping. */
-- ElfW(Addr) l_text_end;
-
- /* Default array for 'l_scope'. */
- struct r_scope_elem *l_scope_mem[4];
---
-2.39.2
-
+++ /dev/null
-From d3ba6c1333b10680ce5900a628108507d9d4b844 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 11 Sep 2023 09:17:52 +0200
-Subject: [PATCH 17/27] elf: Move l_init_called_next to old place of l_text_end
- in link map
-
-This preserves all member offsets and the GLIBC_PRIVATE ABI
-for backporting.
----
- include/link.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/link.h b/include/link.h
-index c6af095d87..686813f281 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -254,6 +254,10 @@ struct link_map
- need not be the same as l_addr. */
- ElfW(Addr) l_map_start, l_map_end;
-
-+ /* Linked list of objects in reverse ELF constructor execution
-+ order. Head of list is stored in _dl_init_called_list. */
-+ struct link_map *l_init_called_next;
-+
- /* Default array for 'l_scope'. */
- struct r_scope_elem *l_scope_mem[4];
- /* Size of array allocated for 'l_scope'. */
-@@ -276,10 +280,6 @@ struct link_map
- /* List of object in order of the init and fini calls. */
- struct link_map **l_initfini;
-
-- /* Linked list of objects in reverse ELF constructor execution
-- order. Head of list is stored in _dl_init_called_list. */
-- struct link_map *l_init_called_next;
--
- /* List of the dependencies introduced through symbol binding. */
- struct link_map_reldeps
- {
---
-2.39.2
-
+++ /dev/null
-From 89da8bc588c2296252543b049bf6d9272321f90d Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 11 Sep 2023 10:06:15 +0200
-Subject: [PATCH 18/27] NEWS: Add the 2.38.1 bug list
-
----
- NEWS | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f1a14f45dd..64596d5d09 100644
---- a/NEWS
-+++ b/NEWS
-@@ -9,7 +9,10 @@ Version 2.38.1
-
- The following bugs are resolved with this release:
-
-+ [30723] posix_memalign repeatedly scans long bin lists
- [30785] Always call destructors in reverse constructor order
-+ [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
-+ -D_FILE_OFFSET_BITS=64
-
- \f
- Version 2.38
-@@ -139,9 +142,6 @@ The following bugs are resolved with this release:
- [30555] string: strerror can incorrectly return NULL
- [30579] malloc: trim_threshold in realloc lead to high memory usage
- [30662] nscd: Group and password cache use errno in place of errval
-- [30723] posix_memalign repeatedly scans long bin lists
-- [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
-- -D_FILE_OFFSET_BITS=64
- \f
- Version 2.37
-
---
-2.39.2
-
+++ /dev/null
-From b25508dd774b617f99419bdc3cf2ace4560cd2d6 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Wed, 13 Sep 2023 14:10:56 +0200
-Subject: [PATCH 19/27] CVE-2023-4527: Stack read overflow with large TCP
- responses in no-aaaa mode
-
-Without passing alt_dns_packet_buffer, __res_context_search can only
-store 2048 bytes (what fits into dns_packet_buffer). However,
-the function returns the total packet size, and the subsequent
-DNS parsing code in _nss_dns_gethostbyname4_r reads beyond the end
-of the stack-allocated buffer.
-
-Fixes commit f282cdbe7f436c75864e5640a4 ("resolv: Implement no-aaaa
-stub resolver option") and bug 30842.
-
-(cherry picked from commit bd77dd7e73e3530203be1c52c8a29d08270cb25d)
----
- NEWS | 9 +++
- resolv/Makefile | 2 +
- resolv/nss_dns/dns-host.c | 2 +-
- resolv/tst-resolv-noaaaa-vc.c | 129 ++++++++++++++++++++++++++++++++++
- 4 files changed, 141 insertions(+), 1 deletion(-)
- create mode 100644 resolv/tst-resolv-noaaaa-vc.c
-
-diff --git a/NEWS b/NEWS
-index 64596d5d09..dfee278a9c 100644
---- a/NEWS
-+++ b/NEWS
-@@ -7,12 +7,21 @@ using `glibc' in the "product" field.
- \f
- Version 2.38.1
-
-+Security related changes:
-+
-+ CVE-2023-4527: If the system is configured in no-aaaa mode via
-+ /etc/resolv.conf, getaddrinfo is called for the AF_UNSPEC address
-+ family, and a DNS response is received over TCP that is larger than
-+ 2048 bytes, getaddrinfo may potentially disclose stack contents via
-+ the returned address data, or crash.
-+
- The following bugs are resolved with this release:
-
- [30723] posix_memalign repeatedly scans long bin lists
- [30785] Always call destructors in reverse constructor order
- [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with
- -D_FILE_OFFSET_BITS=64
-+ [30842] Stack read overflow in getaddrinfo in no-aaaa mode (CVE-2023-4527)
-
- \f
- Version 2.38
-diff --git a/resolv/Makefile b/resolv/Makefile
-index 054b1fa36c..2f99eb3862 100644
---- a/resolv/Makefile
-+++ b/resolv/Makefile
-@@ -102,6 +102,7 @@ tests += \
- tst-resolv-invalid-cname \
- tst-resolv-network \
- tst-resolv-noaaaa \
-+ tst-resolv-noaaaa-vc \
- tst-resolv-nondecimal \
- tst-resolv-res_init-multi \
- tst-resolv-search \
-@@ -293,6 +294,7 @@ $(objpfx)tst-resolv-res_init-thread: $(objpfx)libresolv.so \
- $(objpfx)tst-resolv-invalid-cname: $(objpfx)libresolv.so \
- $(shared-thread-library)
- $(objpfx)tst-resolv-noaaaa: $(objpfx)libresolv.so $(shared-thread-library)
-+$(objpfx)tst-resolv-noaaaa-vc: $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library)
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index 1d60c51f5e..5d0ab30de6 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -427,7 +427,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
- {
- n = __res_context_search (ctx, name, C_IN, T_A,
- dns_packet_buffer, sizeof (dns_packet_buffer),
-- NULL, NULL, NULL, NULL, NULL);
-+ &alt_dns_packet_buffer, NULL, NULL, NULL, NULL);
- if (n >= 0)
- status = gaih_getanswer_noaaaa (alt_dns_packet_buffer, n,
- &abuf, pat, errnop, herrnop, ttlp);
-diff --git a/resolv/tst-resolv-noaaaa-vc.c b/resolv/tst-resolv-noaaaa-vc.c
-new file mode 100644
-index 0000000000..9f5aebd99f
---- /dev/null
-+++ b/resolv/tst-resolv-noaaaa-vc.c
-@@ -0,0 +1,129 @@
-+/* Test the RES_NOAAAA resolver option with a large response.
-+ Copyright (C) 2022-2023 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <errno.h>
-+#include <netdb.h>
-+#include <resolv.h>
-+#include <stdbool.h>
-+#include <stdlib.h>
-+#include <support/check.h>
-+#include <support/check_nss.h>
-+#include <support/resolv_test.h>
-+#include <support/support.h>
-+#include <support/xmemstream.h>
-+
-+/* Used to keep track of the number of queries. */
-+static volatile unsigned int queries;
-+
-+/* If true, add a large TXT record at the start of the answer section. */
-+static volatile bool stuff_txt;
-+
-+static void
-+response (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b,
-+ const char *qname, uint16_t qclass, uint16_t qtype)
-+{
-+ /* If not using TCP, just force its use. */
-+ if (!ctx->tcp)
-+ {
-+ struct resolv_response_flags flags = {.tc = true};
-+ resolv_response_init (b, flags);
-+ resolv_response_add_question (b, qname, qclass, qtype);
-+ return;
-+ }
-+
-+ /* The test needs to send four queries, the first three are used to
-+ grow the NSS buffer via the ERANGE handshake. */
-+ ++queries;
-+ TEST_VERIFY (queries <= 4);
-+
-+ /* AAAA queries are supposed to be disabled. */
-+ TEST_COMPARE (qtype, T_A);
-+ TEST_COMPARE (qclass, C_IN);
-+ TEST_COMPARE_STRING (qname, "example.com");
-+
-+ struct resolv_response_flags flags = {};
-+ resolv_response_init (b, flags);
-+ resolv_response_add_question (b, qname, qclass, qtype);
-+
-+ resolv_response_section (b, ns_s_an);
-+
-+ if (stuff_txt)
-+ {
-+ resolv_response_open_record (b, qname, qclass, T_TXT, 60);
-+ int zero = 0;
-+ for (int i = 0; i <= 15000; ++i)
-+ resolv_response_add_data (b, &zero, sizeof (zero));
-+ resolv_response_close_record (b);
-+ }
-+
-+ for (int i = 0; i < 200; ++i)
-+ {
-+ resolv_response_open_record (b, qname, qclass, qtype, 60);
-+ char ipv4[4] = {192, 0, 2, i + 1};
-+ resolv_response_add_data (b, &ipv4, sizeof (ipv4));
-+ resolv_response_close_record (b);
-+ }
-+}
-+
-+static int
-+do_test (void)
-+{
-+ struct resolv_test *obj = resolv_test_start
-+ ((struct resolv_redirect_config)
-+ {
-+ .response_callback = response
-+ });
-+
-+ _res.options |= RES_NOAAAA;
-+
-+ for (int do_stuff_txt = 0; do_stuff_txt < 2; ++do_stuff_txt)
-+ {
-+ queries = 0;
-+ stuff_txt = do_stuff_txt;
-+
-+ struct addrinfo *ai = NULL;
-+ int ret;
-+ ret = getaddrinfo ("example.com", "80",
-+ &(struct addrinfo)
-+ {
-+ .ai_family = AF_UNSPEC,
-+ .ai_socktype = SOCK_STREAM,
-+ }, &ai);
-+
-+ char *expected_result;
-+ {
-+ struct xmemstream mem;
-+ xopen_memstream (&mem);
-+ for (int i = 0; i < 200; ++i)
-+ fprintf (mem.out, "address: STREAM/TCP 192.0.2.%d 80\n", i + 1);
-+ xfclose_memstream (&mem);
-+ expected_result = mem.buffer;
-+ }
-+
-+ check_addrinfo ("example.com", ai, ret, expected_result);
-+
-+ free (expected_result);
-+ freeaddrinfo (ai);
-+ }
-+
-+ resolv_test_end (obj);
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
---
-2.39.2
-
+++ /dev/null
-From 00ae4f10b504bc4564e9f22f00907093f1ab9338 Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Date: Fri, 15 Sep 2023 13:51:12 -0400
-Subject: [PATCH 20/27] getaddrinfo: Fix use after free in getcanonname
- (CVE-2023-4806)
-
-When an NSS plugin only implements the _gethostbyname2_r and
-_getcanonname_r callbacks, getaddrinfo could use memory that was freed
-during tmpbuf resizing, through h_name in a previous query response.
-
-The backing store for res->at->name when doing a query with
-gethostbyname3_r or gethostbyname2_r is tmpbuf, which is reallocated in
-gethosts during the query. For AF_INET6 lookup with AI_ALL |
-AI_V4MAPPED, gethosts gets called twice, once for a v6 lookup and second
-for a v4 lookup. In this case, if the first call reallocates tmpbuf
-enough number of times, resulting in a malloc, th->h_name (that
-res->at->name refers to) ends up on a heap allocated storage in tmpbuf.
-Now if the second call to gethosts also causes the plugin callback to
-return NSS_STATUS_TRYAGAIN, tmpbuf will get freed, resulting in a UAF
-reference in res->at->name. This then gets dereferenced in the
-getcanonname_r plugin call, resulting in the use after free.
-
-Fix this by copying h_name over and freeing it at the end. This
-resolves BZ #30843, which is assigned CVE-2023-4806.
-
-Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-(cherry picked from commit 973fe93a5675c42798b2161c6f29c01b0e243994)
----
- nss/Makefile | 15 ++++-
- nss/nss_test_gai_hv2_canonname.c | 56 +++++++++++++++++
- nss/tst-nss-gai-hv2-canonname.c | 63 +++++++++++++++++++
- nss/tst-nss-gai-hv2-canonname.h | 1 +
- .../postclean.req | 0
- .../tst-nss-gai-hv2-canonname.script | 2 +
- sysdeps/posix/getaddrinfo.c | 25 +++++---
- 7 files changed, 152 insertions(+), 10 deletions(-)
- create mode 100644 nss/nss_test_gai_hv2_canonname.c
- create mode 100644 nss/tst-nss-gai-hv2-canonname.c
- create mode 100644 nss/tst-nss-gai-hv2-canonname.h
- create mode 100644 nss/tst-nss-gai-hv2-canonname.root/postclean.req
- create mode 100644 nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script
-
-diff --git a/nss/Makefile b/nss/Makefile
-index 06fcdc450f..8a5126ecf3 100644
---- a/nss/Makefile
-+++ b/nss/Makefile
-@@ -82,6 +82,7 @@ tests-container := \
- tst-nss-test3 \
- tst-reload1 \
- tst-reload2 \
-+ tst-nss-gai-hv2-canonname \
- # tests-container
-
- # Tests which need libdl
-@@ -145,7 +146,8 @@ libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes))
- ifeq ($(build-static-nss),yes)
- tests-static += tst-nss-static
- endif
--extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os
-+extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os \
-+ nss_test_gai_hv2_canonname.os
-
- include ../Rules
-
-@@ -180,12 +182,16 @@ rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver
- libof-nss_test1 = extramodules
- libof-nss_test2 = extramodules
- libof-nss_test_errno = extramodules
-+libof-nss_test_gai_hv2_canonname = extramodules
- $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
- $(build-module)
- $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
- $(build-module)
- $(objpfx)/libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps)
- $(build-module)
-+$(objpfx)/libnss_test_gai_hv2_canonname.so: \
-+ $(objpfx)nss_test_gai_hv2_canonname.os $(link-libc-deps)
-+ $(build-module)
- $(objpfx)nss_test2.os : nss_test1.c
- # Use the nss_files suffix for these objects as well.
- $(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so
-@@ -195,10 +201,14 @@ $(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so
- $(objpfx)/libnss_test_errno.so$(libnss_files.so-version): \
- $(objpfx)/libnss_test_errno.so
- $(make-link)
-+$(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \
-+ $(objpfx)/libnss_test_gai_hv2_canonname.so
-+ $(make-link)
- $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \
- $(objpfx)/libnss_test1.so$(libnss_files.so-version) \
- $(objpfx)/libnss_test2.so$(libnss_files.so-version) \
-- $(objpfx)/libnss_test_errno.so$(libnss_files.so-version)
-+ $(objpfx)/libnss_test_errno.so$(libnss_files.so-version) \
-+ $(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version)
-
- ifeq (yes,$(have-thread-library))
- $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
-@@ -215,3 +225,4 @@ LDFLAGS-tst-nss-test3 = -Wl,--disable-new-dtags
- LDFLAGS-tst-nss-test4 = -Wl,--disable-new-dtags
- LDFLAGS-tst-nss-test5 = -Wl,--disable-new-dtags
- LDFLAGS-tst-nss-test_errno = -Wl,--disable-new-dtags
-+LDFLAGS-tst-nss-test_gai_hv2_canonname = -Wl,--disable-new-dtags
-diff --git a/nss/nss_test_gai_hv2_canonname.c b/nss/nss_test_gai_hv2_canonname.c
-new file mode 100644
-index 0000000000..4439c83c9f
---- /dev/null
-+++ b/nss/nss_test_gai_hv2_canonname.c
-@@ -0,0 +1,56 @@
-+/* NSS service provider that only provides gethostbyname2_r.
-+ Copyright The GNU Toolchain Authors.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <nss.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include "nss/tst-nss-gai-hv2-canonname.h"
-+
-+/* Catch misnamed and functions. */
-+#pragma GCC diagnostic error "-Wmissing-prototypes"
-+NSS_DECLARE_MODULE_FUNCTIONS (test_gai_hv2_canonname)
-+
-+extern enum nss_status _nss_files_gethostbyname2_r (const char *, int,
-+ struct hostent *, char *,
-+ size_t, int *, int *);
-+
-+enum nss_status
-+_nss_test_gai_hv2_canonname_gethostbyname2_r (const char *name, int af,
-+ struct hostent *result,
-+ char *buffer, size_t buflen,
-+ int *errnop, int *herrnop)
-+{
-+ return _nss_files_gethostbyname2_r (name, af, result, buffer, buflen, errnop,
-+ herrnop);
-+}
-+
-+enum nss_status
-+_nss_test_gai_hv2_canonname_getcanonname_r (const char *name, char *buffer,
-+ size_t buflen, char **result,
-+ int *errnop, int *h_errnop)
-+{
-+ /* We expect QUERYNAME, which is a small enough string that it shouldn't fail
-+ the test. */
-+ if (memcmp (QUERYNAME, name, sizeof (QUERYNAME))
-+ || buflen < sizeof (QUERYNAME))
-+ abort ();
-+
-+ strncpy (buffer, name, buflen);
-+ *result = buffer;
-+ return NSS_STATUS_SUCCESS;
-+}
-diff --git a/nss/tst-nss-gai-hv2-canonname.c b/nss/tst-nss-gai-hv2-canonname.c
-new file mode 100644
-index 0000000000..d5f10c07d6
---- /dev/null
-+++ b/nss/tst-nss-gai-hv2-canonname.c
-@@ -0,0 +1,63 @@
-+/* Test NSS query path for plugins that only implement gethostbyname2
-+ (#30843).
-+ Copyright The GNU Toolchain Authors.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <nss.h>
-+#include <netdb.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <support/check.h>
-+#include <support/xstdio.h>
-+#include "nss/tst-nss-gai-hv2-canonname.h"
-+
-+#define PREPARE do_prepare
-+
-+static void do_prepare (int a, char **av)
-+{
-+ FILE *hosts = xfopen ("/etc/hosts", "w");
-+ for (unsigned i = 2; i < 255; i++)
-+ {
-+ fprintf (hosts, "ff01::ff02:ff03:%u:2\ttest.example.com\n", i);
-+ fprintf (hosts, "192.168.0.%u\ttest.example.com\n", i);
-+ }
-+ xfclose (hosts);
-+}
-+
-+static int
-+do_test (void)
-+{
-+ __nss_configure_lookup ("hosts", "test_gai_hv2_canonname");
-+
-+ struct addrinfo hints = {};
-+ struct addrinfo *result = NULL;
-+
-+ hints.ai_family = AF_INET6;
-+ hints.ai_flags = AI_ALL | AI_V4MAPPED | AI_CANONNAME;
-+
-+ int ret = getaddrinfo (QUERYNAME, NULL, &hints, &result);
-+
-+ if (ret != 0)
-+ FAIL_EXIT1 ("getaddrinfo failed: %s\n", gai_strerror (ret));
-+
-+ TEST_COMPARE_STRING (result->ai_canonname, QUERYNAME);
-+
-+ freeaddrinfo(result);
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff --git a/nss/tst-nss-gai-hv2-canonname.h b/nss/tst-nss-gai-hv2-canonname.h
-new file mode 100644
-index 0000000000..14f2a9cb08
---- /dev/null
-+++ b/nss/tst-nss-gai-hv2-canonname.h
-@@ -0,0 +1 @@
-+#define QUERYNAME "test.example.com"
-diff --git a/nss/tst-nss-gai-hv2-canonname.root/postclean.req b/nss/tst-nss-gai-hv2-canonname.root/postclean.req
-new file mode 100644
-index 0000000000..e69de29bb2
-diff --git a/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script b/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script
-new file mode 100644
-index 0000000000..31848b4a28
---- /dev/null
-+++ b/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script
-@@ -0,0 +1,2 @@
-+cp $B/nss/libnss_test_gai_hv2_canonname.so $L/libnss_test_gai_hv2_canonname.so.2
-+su
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 0356b622be..b2236b105c 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -120,6 +120,7 @@ struct gaih_result
- {
- struct gaih_addrtuple *at;
- char *canon;
-+ char *h_name;
- bool free_at;
- bool got_ipv6;
- };
-@@ -165,6 +166,7 @@ gaih_result_reset (struct gaih_result *res)
- if (res->free_at)
- free (res->at);
- free (res->canon);
-+ free (res->h_name);
- memset (res, 0, sizeof (*res));
- }
-
-@@ -203,9 +205,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
- return 0;
- }
-
--/* Convert struct hostent to a list of struct gaih_addrtuple objects. h_name
-- is not copied, and the struct hostent object must not be deallocated
-- prematurely. The new addresses are appended to the tuple array in RES. */
-+/* Convert struct hostent to a list of struct gaih_addrtuple objects. The new
-+ addresses are appended to the tuple array in RES. */
- static bool
- convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family,
- struct hostent *h, struct gaih_result *res)
-@@ -238,6 +239,15 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family,
- res->at = array;
- res->free_at = true;
-
-+ /* Duplicate h_name because it may get reclaimed when the underlying storage
-+ is freed. */
-+ if (res->h_name == NULL)
-+ {
-+ res->h_name = __strdup (h->h_name);
-+ if (res->h_name == NULL)
-+ return false;
-+ }
-+
- /* Update the next pointers on reallocation. */
- for (size_t i = 0; i < old; i++)
- array[i].next = array + i + 1;
-@@ -262,7 +272,6 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family,
- }
- array[i].next = array + i + 1;
- }
-- array[0].name = h->h_name;
- array[count - 1].next = NULL;
-
- return true;
-@@ -324,15 +333,15 @@ gethosts (nss_gethostbyname3_r fct, int family, const char *name,
- memory allocation failure. The returned string is allocated on the
- heap; the caller has to free it. */
- static char *
--getcanonname (nss_action_list nip, struct gaih_addrtuple *at, const char *name)
-+getcanonname (nss_action_list nip, const char *hname, const char *name)
- {
- nss_getcanonname_r *cfct = __nss_lookup_function (nip, "getcanonname_r");
- char *s = (char *) name;
- if (cfct != NULL)
- {
- char buf[256];
-- if (DL_CALL_FCT (cfct, (at->name ?: name, buf, sizeof (buf),
-- &s, &errno, &h_errno)) != NSS_STATUS_SUCCESS)
-+ if (DL_CALL_FCT (cfct, (hname ?: name, buf, sizeof (buf), &s, &errno,
-+ &h_errno)) != NSS_STATUS_SUCCESS)
- /* If the canonical name cannot be determined, use the passed
- string. */
- s = (char *) name;
-@@ -771,7 +780,7 @@ get_nss_addresses (const char *name, const struct addrinfo *req,
- if ((req->ai_flags & AI_CANONNAME) != 0
- && res->canon == NULL)
- {
-- char *canonbuf = getcanonname (nip, res->at, name);
-+ char *canonbuf = getcanonname (nip, res->h_name, name);
- if (canonbuf == NULL)
- {
- __resolv_context_put (res_ctx);
---
-2.39.2
-
+++ /dev/null
-From 63250e9c571314b6daa2c949ea0af335ee766751 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Tue, 1 Aug 2023 17:01:37 +0200
-Subject: [PATCH 21/27] iconv: restore verbosity with unrecognized encoding
- names (bug 30694)
-
-Commit 91927b7c76 ("Rewrite iconv option parsing [BZ #19519]") changed the
-iconv program to call __gconv_open directly instead of the iconv_open
-wrapper, but the former does not set errno. Update the caller to
-interpret the return codes like iconv_open does.
-
-(cherry picked from commit fc72b6d7d818ab2868920af956d1542d03342a4d)
----
- iconv/iconv_prog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
-index bee898c63c..cf32cf9b44 100644
---- a/iconv/iconv_prog.c
-+++ b/iconv/iconv_prog.c
-@@ -187,7 +187,7 @@ main (int argc, char *argv[])
-
- if (res != __GCONV_OK)
- {
-- if (errno == EINVAL)
-+ if (res == __GCONV_NOCONV || res == __GCONV_NODB)
- {
- /* Try to be nice with the user and tell her which of the
- two encoding names is wrong. This is possible because
---
-2.39.2
-
+++ /dev/null
-From d94461bb86ba176b9390c0015bb612a528e22d95 Mon Sep 17 00:00:00 2001
-From: Mahesh Bodapati <bmahi496@linux.ibm.com>
-Date: Fri, 11 Aug 2023 10:38:25 -0500
-Subject: [PATCH 22/27] string: Fix tester build with fortify enable with gcc <
- 12
-
-When building with fortify enabled, GCC < 12 issues a warning on the
-fortify strncat wrapper might overflow the destination buffer (the
-failure is tied to -Werror).
-
-Checked on ppc64 and x86_64.
-Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-
-(cherry picked from commit f1c7ed0859a45929136836341741c7cd70f428cb)
----
- string/tester.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/string/tester.c b/string/tester.c
-index f7d4bac5a8..824cf315ff 100644
---- a/string/tester.c
-+++ b/string/tester.c
-@@ -34,6 +34,14 @@
- DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-truncation");
- #endif
-
-+/* When building with fortify enabled, GCC < 12 issues a warning on the
-+ fortify strncat wrapper might overflow the destination buffer (the
-+ failure is tied to -Werror).
-+ Triggered by strncat fortify wrapper when it is enabled. */
-+#if __GNUC_PREREQ (11, 0)
-+DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
-+#endif
-+
- #include <errno.h>
- #include <stdint.h>
- #include <stdio.h>
-@@ -52,9 +60,6 @@ DIAG_IGNORE_NEEDS_COMMENT (5.0, "-Wmemset-transposed-args");
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wrestrict");
- DIAG_IGNORE_NEEDS_COMMENT (7, "-Wstringop-overflow=");
- #endif
--#if __GNUC_PREREQ (11, 0)
--DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
--#endif
-
-
- #define STREQ(a, b) (strcmp((a), (b)) == 0)
---
-2.39.2
-
+++ /dev/null
-From 0e1ef6779a90bc0f8a05bc367796df2793deecaa Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Thu, 24 Aug 2023 21:36:34 +0200
-Subject: [PATCH 23/27] manual/jobs.texi: Add missing @item EPERM for getpgid
-
-The missing @item makes it look like errno will be set to ESRCH
-if a cross-session getpgid is not permitted.
-
-Found by ulfvonbelow on irc.
-
-(cherry picked from commit 5a21cefd5abab1b99eda1fbf84204a9bf41662ab)
----
- manual/job.texi | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/manual/job.texi b/manual/job.texi
-index 42cb9fb26d..8157f13a1c 100644
---- a/manual/job.texi
-+++ b/manual/job.texi
-@@ -1133,6 +1133,7 @@ following @code{errno} error conditions are defined for this function:
- @table @code
- @item ESRCH
- There is no process with the given process ID @var{pid}.
-+@item EPERM
- The calling process and the process specified by @var{pid} are in
- different sessions, and the implementation doesn't allow to access the
- process group ID of the process with ID @var{pid} from the calling
---
-2.39.2
-
+++ /dev/null
-From 5ee59ca371b99984232d7584fe2b1a758b4421d3 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Mon, 25 Sep 2023 01:21:51 +0100
-Subject: [PATCH 24/27] Fix leak in getaddrinfo introduced by the fix for
- CVE-2023-4806 [BZ #30843]
-
-This patch fixes a very recently added leak in getaddrinfo.
-
-This was assigned CVE-2023-5156.
-
-Resolves: BZ #30884
-Related: BZ #30842
-
-Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-(cherry picked from commit ec6b95c3303c700eb89eebeda2d7264cc184a796)
----
- nss/Makefile | 20 ++++++++++++++++++++
- nss/tst-nss-gai-hv2-canonname.c | 3 +++
- sysdeps/posix/getaddrinfo.c | 4 +---
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/nss/Makefile b/nss/Makefile
-index 8a5126ecf3..668ba34b18 100644
---- a/nss/Makefile
-+++ b/nss/Makefile
-@@ -149,6 +149,15 @@ endif
- extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os \
- nss_test_gai_hv2_canonname.os
-
-+ifeq ($(run-built-tests),yes)
-+ifneq (no,$(PERL))
-+tests-special += $(objpfx)mtrace-tst-nss-gai-hv2-canonname.out
-+endif
-+endif
-+
-+generated += mtrace-tst-nss-gai-hv2-canonname.out \
-+ tst-nss-gai-hv2-canonname.mtrace
-+
- include ../Rules
-
- ifeq (yes,$(have-selinux))
-@@ -217,6 +226,17 @@ endif
- $(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
- $(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so
-
-+tst-nss-gai-hv2-canonname-ENV = \
-+ MALLOC_TRACE=$(objpfx)tst-nss-gai-hv2-canonname.mtrace \
-+ LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so
-+$(objpfx)mtrace-tst-nss-gai-hv2-canonname.out: \
-+ $(objpfx)tst-nss-gai-hv2-canonname.out
-+ { test -r $(objpfx)tst-nss-gai-hv2-canonname.mtrace \
-+ || ( echo "tst-nss-gai-hv2-canonname.mtrace does not exist"; exit 77; ) \
-+ && $(common-objpfx)malloc/mtrace \
-+ $(objpfx)tst-nss-gai-hv2-canonname.mtrace; } > $@; \
-+ $(evaluate-test)
-+
- # Disable DT_RUNPATH on NSS tests so that the glibc internal NSS
- # functions can load testing NSS modules via DT_RPATH.
- LDFLAGS-tst-nss-test1 = -Wl,--disable-new-dtags
-diff --git a/nss/tst-nss-gai-hv2-canonname.c b/nss/tst-nss-gai-hv2-canonname.c
-index d5f10c07d6..7db53cf09d 100644
---- a/nss/tst-nss-gai-hv2-canonname.c
-+++ b/nss/tst-nss-gai-hv2-canonname.c
-@@ -21,6 +21,7 @@
- #include <netdb.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <mcheck.h>
- #include <support/check.h>
- #include <support/xstdio.h>
- #include "nss/tst-nss-gai-hv2-canonname.h"
-@@ -41,6 +42,8 @@ static void do_prepare (int a, char **av)
- static int
- do_test (void)
- {
-+ mtrace ();
-+
- __nss_configure_lookup ("hosts", "test_gai_hv2_canonname");
-
- struct addrinfo hints = {};
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index b2236b105c..13082305d3 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -1196,9 +1196,7 @@ free_and_return:
- if (malloc_name)
- free ((char *) name);
- free (addrmem);
-- if (res.free_at)
-- free (res.at);
-- free (res.canon);
-+ gaih_result_reset (&res);
-
- return result;
- }
---
-2.39.2
-
+++ /dev/null
-From f6445dc94da185b3d1ee283f0ca0a34c4e1986cc Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Date: Tue, 26 Sep 2023 07:38:07 -0400
-Subject: [PATCH 25/27] Document CVE-2023-4806 and CVE-2023-5156 in NEWS
-
-These are tracked in BZ #30884 and BZ #30843.
-
-Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-(cherry picked from commit fd134feba35fa839018965733b34d28a09a075dd)
----
- NEWS | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/NEWS b/NEWS
-index dfee278a9c..f1b1b0a3b4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -15,6 +15,15 @@ Security related changes:
- 2048 bytes, getaddrinfo may potentially disclose stack contents via
- the returned address data, or crash.
-
-+ CVE-2023-4806: When an NSS plugin only implements the
-+ _gethostbyname2_r and _getcanonname_r callbacks, getaddrinfo could use
-+ memory that was freed during buffer resizing, potentially causing a
-+ crash or read or write to arbitrary memory.
-+
-+ CVE-2023-5156: The fix for CVE-2023-4806 introduced a memory leak when
-+ an application calls getaddrinfo for AF_INET6 with AI_CANONNAME,
-+ AI_ALL and AI_V4MAPPED flags set.
-+
- The following bugs are resolved with this release:
-
- [30723] posix_memalign repeatedly scans long bin lists
---
-2.39.2
-
+++ /dev/null
-From 73e3fcd1a552783e66ff1f65c5f322e2f17a81d1 Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Date: Tue, 19 Sep 2023 13:25:40 -0400
-Subject: [PATCH 26/27] Propagate GLIBC_TUNABLES in setxid binaries
-
-GLIBC_TUNABLES scrubbing happens earlier than envvar scrubbing and some
-tunables are required to propagate past setxid boundary, like their
-env_alias. Rely on tunable scrubbing to clean out GLIBC_TUNABLES like
-before, restoring behaviour in glibc 2.37 and earlier.
-
-Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-(cherry picked from commit 0d5f9ea97f1b39f2a855756078771673a68497e1)
----
- sysdeps/generic/unsecvars.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h
-index 81397fb90b..8278c50a84 100644
---- a/sysdeps/generic/unsecvars.h
-+++ b/sysdeps/generic/unsecvars.h
-@@ -4,7 +4,6 @@
- #define UNSECURE_ENVVARS \
- "GCONV_PATH\0" \
- "GETCONF_DIR\0" \
-- "GLIBC_TUNABLES\0" \
- "HOSTALIASES\0" \
- "LD_AUDIT\0" \
- "LD_DEBUG\0" \
---
-2.39.2
-
+++ /dev/null
-From 750a45a783906a19591fb8ff6b7841470f1f5701 Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Date: Tue, 19 Sep 2023 18:39:32 -0400
-Subject: [PATCH 27/27] tunables: Terminate if end of input is reached
- (CVE-2023-4911)
-
-The string parsing routine may end up writing beyond bounds of tunestr
-if the input tunable string is malformed, of the form name=name=val.
-This gets processed twice, first as name=name=val and next as name=val,
-resulting in tunestr being name=name=val:name=val, thus overflowing
-tunestr.
-
-Terminate the parsing loop at the first instance itself so that tunestr
-does not overflow.
-
-This also fixes up tst-env-setuid-tunables to actually handle failures
-correct and add new tests to validate the fix for this CVE.
-
-Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-(cherry picked from commit 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa)
----
- NEWS | 5 +++++
- elf/dl-tunables.c | 17 +++++++++-------
- elf/tst-env-setuid-tunables.c | 37 +++++++++++++++++++++++++++--------
- 3 files changed, 44 insertions(+), 15 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f1b1b0a3b4..bfcd46efa9 100644
---- a/NEWS
-+++ b/NEWS
-@@ -24,6 +24,11 @@ Security related changes:
- an application calls getaddrinfo for AF_INET6 with AI_CANONNAME,
- AI_ALL and AI_V4MAPPED flags set.
-
-+ CVE-2023-4911: If a tunable of the form NAME=NAME=VAL is passed in the
-+ environment of a setuid program and NAME is valid, it may result in a
-+ buffer overflow, which could be exploited to achieve escalated
-+ privileges. This flaw was introduced in glibc 2.34.
-+
- The following bugs are resolved with this release:
-
- [30723] posix_memalign repeatedly scans long bin lists
-diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
-index 62b7332d95..cae67efa0a 100644
---- a/elf/dl-tunables.c
-+++ b/elf/dl-tunables.c
-@@ -180,11 +180,7 @@ parse_tunables (char *tunestr, char *valstring)
- /* If we reach the end of the string before getting a valid name-value
- pair, bail out. */
- if (p[len] == '\0')
-- {
-- if (__libc_enable_secure)
-- tunestr[off] = '\0';
-- return;
-- }
-+ break;
-
- /* We did not find a valid name-value pair before encountering the
- colon. */
-@@ -244,9 +240,16 @@ parse_tunables (char *tunestr, char *valstring)
- }
- }
-
-- if (p[len] != '\0')
-- p += len + 1;
-+ /* We reached the end while processing the tunable string. */
-+ if (p[len] == '\0')
-+ break;
-+
-+ p += len + 1;
- }
-+
-+ /* Terminate tunestr before we leave. */
-+ if (__libc_enable_secure)
-+ tunestr[off] = '\0';
- }
-
- /* Enable the glibc.malloc.check tunable in SETUID/SETGID programs only when
-diff --git a/elf/tst-env-setuid-tunables.c b/elf/tst-env-setuid-tunables.c
-index 7dfb0e073a..f0b92c97e7 100644
---- a/elf/tst-env-setuid-tunables.c
-+++ b/elf/tst-env-setuid-tunables.c
-@@ -50,6 +50,8 @@ const char *teststrings[] =
- "glibc.malloc.perturb=0x800:not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
- "glibc.not_valid.check=2:glibc.malloc.mmap_threshold=4096",
- "not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.check=2",
- "glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096:glibc.malloc.check=2",
- "glibc.malloc.check=4:glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096",
- ":glibc.malloc.garbage=2:glibc.malloc.check=1",
-@@ -68,6 +70,8 @@ const char *resultstrings[] =
- "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
- "glibc.malloc.mmap_threshold=4096",
- "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096",
-+ "",
- "",
- "",
- "",
-@@ -81,11 +85,18 @@ test_child (int off)
- {
- const char *val = getenv ("GLIBC_TUNABLES");
-
-+ printf (" [%d] GLIBC_TUNABLES is %s\n", off, val);
-+ fflush (stdout);
- if (val != NULL && strcmp (val, resultstrings[off]) == 0)
- return 0;
-
- if (val != NULL)
-- printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val);
-+ printf (" [%d] Unexpected GLIBC_TUNABLES VALUE %s, expected %s\n",
-+ off, val, resultstrings[off]);
-+ else
-+ printf (" [%d] GLIBC_TUNABLES environment variable absent\n", off);
-+
-+ fflush (stdout);
-
- return 1;
- }
-@@ -106,21 +117,26 @@ do_test (int argc, char **argv)
- if (ret != 0)
- exit (1);
-
-- exit (EXIT_SUCCESS);
-+ /* Special return code to make sure that the child executed all the way
-+ through. */
-+ exit (42);
- }
- else
- {
-- int ret = 0;
--
- /* Spawn tests. */
- for (int i = 0; i < array_length (teststrings); i++)
- {
- char buf[INT_BUFSIZE_BOUND (int)];
-
-- printf ("Spawned test for %s (%d)\n", teststrings[i], i);
-+ printf ("[%d] Spawned test for %s\n", i, teststrings[i]);
- snprintf (buf, sizeof (buf), "%d\n", i);
-+ fflush (stdout);
- if (setenv ("GLIBC_TUNABLES", teststrings[i], 1) != 0)
-- exit (1);
-+ {
-+ printf (" [%d] Failed to set GLIBC_TUNABLES: %m", i);
-+ support_record_failure ();
-+ continue;
-+ }
-
- int status = support_capture_subprogram_self_sgid (buf);
-
-@@ -128,9 +144,14 @@ do_test (int argc, char **argv)
- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
- return EXIT_UNSUPPORTED;
-
-- ret |= status;
-+ if (WEXITSTATUS (status) != 42)
-+ {
-+ printf (" [%d] child failed with status %d\n", i,
-+ WEXITSTATUS (status));
-+ support_record_failure ();
-+ }
- }
-- return ret;
-+ return 0;
- }
- }
-
---
-2.39.2
-
+++ /dev/null
-From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001
-From: Bruce Rogers <brogers@suse.com>
-Date: Wed, 6 May 2020 15:03:02 -0600
-Subject: [PATCH] [build] Be explicit about -fcommon compiler directive
-
-gcc10 switched default behavior from -fcommon to -fno-common. Since
-"__shared" relies on the legacy behavior, explicitly specify it.
-
-Signed-off-by: Bruce Rogers <brogers@suse.com>
-Modified-by: Michael Brown <mcb30@ipxe.org>
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/Makefile.housekeeping | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
-index 66d6dd449..b6c61c112 100644
---- a/src/Makefile.housekeeping
-+++ b/src/Makefile.housekeeping
-@@ -418,6 +418,7 @@ CFLAGS += -Os
- CFLAGS += -g
- ifeq ($(CCTYPE),gcc)
- CFLAGS += -ffreestanding
-+CFLAGS += -fcommon
- CFLAGS += -Wall -W -Wformat-nonliteral
- HOST_CFLAGS += -Wall -W -Wformat-nonliteral
- endif
+++ /dev/null
-From ddfb60813c74e988ba7c16dbbe1b163593c9da4e Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 15 May 2018 23:25:01 +0200
-Subject: [PATCH] [build] fix stringop truncation warning with GCC 8.x
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 8.x gives a warning about stringop truncation:
-
-util/elf2efi.c:497:2: error: ‘strncpy’ specified bound 8 equals destination
-size [-Werror=stringop-truncation]
-
-It assumes that strncpy() is intended to copy strings, which are NULL
-terminated. We do copy fixed size memory regions, so use memcpy() instead.
----
- src/util/elf2efi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
-index 6718df777..de3c92463 100644
---- a/src/util/elf2efi.c
-+++ b/src/util/elf2efi.c
-@@ -494,7 +494,7 @@ static struct pe_section * process_section ( struct elf_file *elf,
- memset ( new, 0, sizeof ( *new ) + section_filesz );
-
- /* Fill in section header details */
-- strncpy ( ( char * ) new->hdr.Name, name, sizeof ( new->hdr.Name ) );
-+ memcpy ( ( char * ) new->hdr.Name, name, sizeof ( new->hdr.Name ) );
- new->hdr.Misc.VirtualSize = section_memsz;
- new->hdr.VirtualAddress = shdr->sh_addr;
- new->hdr.SizeOfRawData = section_filesz;
+++ /dev/null
-From 5dce2d454b2829431e0484ac0f993b7a2759e0df Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Sat, 25 Aug 2018 13:53:08 +0200
-Subject: [PATCH] [build] handle R_X86_64_PLT32 from binutils 2.31
-
-Starting from binutils 2.31.0 (commit bd7ab16b) x86-64 assembler
-generates R_X86_64_PLT32 instead of R_X86_64_PC32.
----
- src/util/elf2efi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
-index 6718df777..2c5b9df8a 100644
---- a/src/util/elf2efi.c
-+++ b/src/util/elf2efi.c
-@@ -636,6 +636,7 @@ static void process_reloc ( struct elf_file *elf, const Elf_Shdr *shdr,
- case ELF_MREL ( EM_ARM, R_ARM_THM_JUMP24 ) :
- case ELF_MREL ( EM_ARM, R_ARM_V4BX ):
- case ELF_MREL ( EM_X86_64, R_X86_64_PC32 ) :
-+ case ELF_MREL ( EM_X86_64, R_X86_64_PLT32 ) :
- case ELF_MREL ( EM_AARCH64, R_AARCH64_CALL26 ) :
- case ELF_MREL ( EM_AARCH64, R_AARCH64_JUMP26 ) :
- case ELF_MREL ( EM_AARCH64, R_AARCH64_ADR_PREL_LO21 ) :
+++ /dev/null
-From 08caa8be3a143d6f33782f398b7937efb39ff283 Mon Sep 17 00:00:00 2001
-From: Justin Cano <5184128+jstncno@users.noreply.github.com>
-Date: Thu, 3 Aug 2023 09:58:11 -0700
-Subject: [PATCH] Use the right sized register for the push operand based on
- the size of the value being pushed
-
-Fixes https://github.com/ipxe/ipxe/issues/997
----
- src/arch/x86/include/librm.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/x86/include/librm.h b/src/arch/x86/include/librm.h
-index 5196d390fa..d9e748adfc 100644
---- a/src/arch/x86/include/librm.h
-+++ b/src/arch/x86/include/librm.h
-@@ -250,8 +250,10 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
- /* CODE_DEFAULT: restore default .code32/.code64 directive */
- #ifdef __x86_64__
- #define CODE_DEFAULT ".code64"
-+#define PUSH "pushq"
- #else
- #define CODE_DEFAULT ".code32"
-+#define PUSH "pushl"
- #endif
-
- /* LINE_SYMBOL: declare a symbol for the current source code line */
-@@ -268,7 +270,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
-
- /* REAL_CODE: declare a fragment of code that executes in real mode */
- #define REAL_CODE( asm_code_str ) \
-- "push $1f\n\t" \
-+ PUSH " $1f\n\t" \
- "call real_call\n\t" \
- TEXT16_CODE ( "\n1:\n\t" \
- asm_code_str \
-@@ -277,7 +279,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
-
- /* PHYS_CODE: declare a fragment of code that executes in flat physical mode */
- #define PHYS_CODE( asm_code_str ) \
-- "push $1f\n\t" \
-+ PUSH " $1f\n\t" \
- "call phys_call\n\t" \
- ".section \".text.phys\", \"ax\", @progbits\n\t"\
- "\n" LINE_SYMBOL "\n\t" \
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-002
+
+Bug-Reported-by: srobertson@peratonlabs.com
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00049.html
+
+Bug-Description:
+
+It's possible for readline to try to zero out a line that's not null-
+terminated, leading to a memory fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/display.c 2022-04-05 10:47:31.000000000 -0400
+--- display.c 2022-12-13 13:11:22.000000000 -0500
+***************
+*** 2684,2692 ****
+
+ if (visible_line)
+! {
+! temp = visible_line;
+! while (*temp)
+! *temp++ = '\0';
+! }
+ rl_on_new_line ();
+ forced_display++;
+--- 2735,2740 ----
+
+ if (visible_line)
+! memset (visible_line, 0, line_size);
+!
+ rl_on_new_line ();
+ forced_display++;
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 1
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 2
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-003
+
+Bug-Reported-by: Stefan Klinger <readline-gnu.org@stefan-klinger.de>
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-08/msg00018.html
+
+Bug-Description:
+
+Patch (apply with `patch -p0'):
+
+The custom color prefix that readline uses to color possible completions
+must have a leading `.'.
+
+*** ../readline-8.2-patched/colors.c 2021-12-08 11:38:25.000000000 -0500
+--- colors.c 2023-08-28 16:40:04.000000000 -0400
+***************
+*** 74,78 ****
+ static void restore_default_color (void);
+
+! #define RL_COLOR_PREFIX_EXTENSION "readline-colored-completion-prefix"
+
+ COLOR_EXT_TYPE *_rl_color_ext_list = 0;
+--- 74,78 ----
+ static void restore_default_color (void);
+
+! #define RL_COLOR_PREFIX_EXTENSION ".readline-colored-completion-prefix"
+
+ COLOR_EXT_TYPE *_rl_color_ext_list = 0;
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 2
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 3
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-004
+
+Bug-Reported-by: Henry Bent <henry.r.bent@gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00044.html
+
+Bug-Description:
+
+Patch (apply with `patch -p0'):
+
+There are systems that supply one of select or pselect, but not both.
+
+*** ../readline-8.2-patched/input.c 2022-04-08 15:43:24.000000000 -0400
+--- input.c 2022-11-28 09:41:08.000000000 -0500
+***************
+*** 152,156 ****
+--- 152,158 ----
+ int _rl_timeout_init (void);
+ int _rl_timeout_sigalrm_handler (void);
++ #if defined (RL_TIMEOUT_USE_SELECT)
+ int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
++ #endif
+
+ static void _rl_timeout_handle (void);
+***************
+*** 249,253 ****
+ int chars_avail, k;
+ char input;
+! #if defined(HAVE_SELECT)
+ fd_set readfds, exceptfds;
+ struct timeval timeout;
+--- 251,255 ----
+ int chars_avail, k;
+ char input;
+! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
+ fd_set readfds, exceptfds;
+ struct timeval timeout;
+***************
+*** 806,810 ****
+ unsigned char c;
+ int fd;
+! #if defined (HAVE_PSELECT)
+ sigset_t empty_set;
+ fd_set readfds;
+--- 815,819 ----
+ unsigned char c;
+ int fd;
+! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
+ sigset_t empty_set;
+ fd_set readfds;
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 3
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 4
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-005
+
+Bug-Reported-by: Simon Marchi <simon.marchi@polymtl.ca>
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00005.html
+
+Bug-Description:
+
+If an application is using readline in callback mode, and a signal arrives
+after readline checks for it in rl_callback_read_char() but before it
+restores the application's signal handlers, it won't get processed until the
+next time the application calls rl_callback_read_char(). Readline needs to
+check for and resend any pending signals after restoring the application's
+signal handlers.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/callback.c 2022-04-29 12:02:56.000000000 -0400
+--- callback.c 2022-10-11 10:59:06.000000000 -0400
+***************
+*** 116,120 ****
+ do { \
+ if (rl_persistent_signal_handlers == 0) \
+! rl_clear_signals (); \
+ return; \
+ } while (0)
+--- 116,123 ----
+ do { \
+ if (rl_persistent_signal_handlers == 0) \
+! { \
+! rl_clear_signals (); \
+! if (_rl_caught_signal) _rl_signal_handler (_rl_caught_signal); \
+! } \
+ return; \
+ } while (0)
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 4
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 5
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-006
+
+Bug-Reported-by: Tom de Vries <tdevries@suse.de>
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00001.html
+
+Bug-Description:
+
+This is a variant of the same issue as the one fixed by patch 5. In this
+case, the signal arrives and is pending before readline calls rl_getc().
+When this happens, the pending signal will be handled by the loop, but may
+alter or destroy some state that the callback uses. Readline needs to treat
+this case the same way it would if a signal interrupts pselect/select, so
+compound operations like searches and reading numeric arguments get cleaned
+up properly.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/input.c 2022-12-22 16:15:48.000000000 -0500
+--- input.c 2023-01-10 11:53:45.000000000 -0500
+***************
+*** 812,816 ****
+ rl_getc (FILE *stream)
+ {
+! int result;
+ unsigned char c;
+ int fd;
+--- 812,816 ----
+ rl_getc (FILE *stream)
+ {
+! int result, ostate, osig;
+ unsigned char c;
+ int fd;
+***************
+*** 823,828 ****
+--- 823,842 ----
+ while (1)
+ {
++ osig = _rl_caught_signal;
++ ostate = rl_readline_state;
++
+ RL_CHECK_SIGNALS ();
+
++ #if defined (READLINE_CALLBACKS)
++ /* Do signal handling post-processing here, but just in callback mode
++ for right now because the signal cleanup can change some of the
++ callback state, and we need to either let the application have a
++ chance to react or abort some current operation that gets cleaned
++ up by rl_callback_sigcleanup(). If not, we'll just run through the
++ loop again. */
++ if (osig != 0 && (ostate & RL_STATE_CALLBACK))
++ goto postproc_signal;
++ #endif
++
+ /* We know at this point that _rl_caught_signal == 0 */
+
+***************
+*** 888,891 ****
+--- 902,908 ----
+
+ handle_error:
++ osig = _rl_caught_signal;
++ ostate = rl_readline_state;
++
+ /* If the error that we received was EINTR, then try again,
+ this is simply an interrupted system call to read (). We allow
+***************
+*** 928,933 ****
+--- 945,959 ----
+ #endif /* SIGALRM */
+
++ postproc_signal:
++ /* POSIX says read(2)/pselect(2)/select(2) don't return EINTR for any
++ reason other than being interrupted by a signal, so we can safely
++ call the application's signal event hook. */
+ if (rl_signal_event_hook)
+ (*rl_signal_event_hook) ();
++ #if defined (READLINE_CALLBACKS)
++ else if (osig == SIGINT && (ostate & RL_STATE_CALLBACK) && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG)))
++ /* just these cases for now */
++ _rl_abort_internal ();
++ #endif
+ }
+ }
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 5
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 6
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-007
+
+Bug-Reported-by: Kevin Pulo <kev@pulo.com.au>
+Bug-Reference-ID:
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-11/msg00002.html
+
+Bug-Description:
+
+If readline is called with no prompt, it should display a newline if return
+is typed on an empty line. It should still suppress the final newline if
+return is typed on the last (empty) line of a multi-line command.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/display.c 2022-04-05 10:47:31.000000000 -0400
+--- display.c 2022-12-13 13:11:22.000000000 -0500
+***************
+*** 3342,3348 ****
+ &last_face[_rl_screenwidth - 1 + woff], 1);
+ }
+! _rl_vis_botlin = 0;
+! if (botline_length > 0 || _rl_last_c_pos > 0)
+ rl_crlf ();
+ fflush (rl_outstream);
+ rl_display_fixed++;
+--- 3394,3400 ----
+ &last_face[_rl_screenwidth - 1 + woff], 1);
+ }
+! if ((_rl_vis_botlin == 0 && botline_length == 0) || botline_length > 0 || _rl_last_c_pos > 0)
+ rl_crlf ();
++ _rl_vis_botlin = 0;
+ fflush (rl_outstream);
+ rl_display_fixed++;
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 6
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 7
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-008
+
+Bug-Reported-by:
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+Add missing prototypes for several function declarations.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/text.c Wed Oct 27 11:03:59 2021
+--- text.c Thu Nov 16 16:24:58 2023
+***************
+*** 1765,1770 ****
+ #if defined (READLINE_CALLBACKS)
+ static int
+! _rl_char_search_callback (data)
+! _rl_callback_generic_arg *data;
+ {
+ _rl_callback_func = 0;
+--- 1765,1769 ----
+ #if defined (READLINE_CALLBACKS)
+ static int
+! _rl_char_search_callback (_rl_callback_generic_arg *data)
+ {
+ _rl_callback_func = 0;
+*** ../readline-8.2-patched/bind.c Wed Feb 9 11:02:22 2022
+--- bind.c Thu Nov 16 16:25:17 2023
+***************
+*** 1168,1174 ****
+
+ static int
+! parse_comparison_op (s, indp)
+! const char *s;
+! int *indp;
+ {
+ int i, peekc, op;
+--- 1168,1172 ----
+
+ static int
+! parse_comparison_op (const char *s, int *indp)
+ {
+ int i, peekc, op;
+*** ../readline-8.2-patched/rltty.c Fri Feb 18 11:14:22 2022
+--- rltty.c Thu Nov 16 16:25:36 2023
+***************
+*** 81,86 ****
+ to get the tty settings. */
+ static void
+! set_winsize (tty)
+! int tty;
+ {
+ #if defined (TIOCGWINSZ)
+--- 81,85 ----
+ to get the tty settings. */
+ static void
+! set_winsize (int tty)
+ {
+ #if defined (TIOCGWINSZ)
+
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 7
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 8
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-009
+
+Bug-Reported-by: Stefan H. Holek <stefan@epy.co.at>
+Bug-Reference-ID: <50F8DA45-B7F3-4DE1-AB94-19AE42649CDC@epy.co.at>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-10/msg00021.html
+
+Bug-Description:
+
+Fix issue where the directory name portion of the word to be completed (the
+part that is passed to opendir()) requires both tilde expansion and dequoting.
+Readline only performed tilde expansion in this case, so filename completion
+would fail.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/complete.c 2022-04-05 10:47:06.000000000 -0400
+--- complete.c 2022-10-26 15:08:51.000000000 -0400
+***************
+*** 2527,2531 ****
+ xfree (dirname);
+ dirname = temp;
+! tilde_dirname = 1;
+ }
+
+--- 2527,2532 ----
+ xfree (dirname);
+ dirname = temp;
+! if (*dirname != '~')
+! tilde_dirname = 1; /* indicate successful tilde expansion */
+ }
+
+***************
+*** 2546,2554 ****
+ users_dirname = savestring (dirname);
+ }
+! else if (tilde_dirname == 0 && rl_completion_found_quote && rl_filename_dequoting_function)
+ {
+! /* delete single and double quotes */
+ xfree (dirname);
+! dirname = savestring (users_dirname);
+ }
+ directory = opendir (dirname);
+--- 2547,2560 ----
+ users_dirname = savestring (dirname);
+ }
+! else if (rl_completion_found_quote && rl_filename_dequoting_function)
+ {
+! /* We already ran users_dirname through the dequoting function.
+! If tilde_dirname == 1, we successfully performed tilde expansion
+! on dirname. Now we need to reconcile those results. We either
+! just copy the already-dequoted users_dirname or tilde expand it
+! if we tilde-expanded dirname. */
+! temp = tilde_dirname ? tilde_expand (users_dirname) : savestring (users_dirname);
+ xfree (dirname);
+! dirname = temp;
+ }
+ directory = opendir (dirname);
+
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 8
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 9
--- /dev/null
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 8.2
+Patch-ID: readline82-010
+
+Bug-Reported-by: Martin Castillo <castilma@uni-bremen.de>
+Bug-Reference-ID: <2d42153b-cf65-caba-dff1-cd3bc6268c7e@uni-bremen.de>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-01/msg00000.html
+
+Bug-Description:
+
+Fix the case where text to be completed from the line buffer (quoted) is
+compared to the common prefix of the possible matches (unquoted) and the
+quoting makes the former appear to be longer than the latter. Readline
+assumes the match doesn't add any characters to the word and doesn't display
+multiple matches.
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-8.2-patched/complete.c Tue Apr 5 10:47:06 2022
+--- complete.c Sat Jan 7 14:19:45 2023
+***************
+*** 2032,2038 ****
+ text = rl_copy_text (start, end);
+ matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
+ /* nontrivial_lcd is set if the common prefix adds something to the word
+ being completed. */
+! nontrivial_lcd = matches && compare_match (text, matches[0]) != 0;
+ if (what_to_do == '!' || what_to_do == '@')
+ tlen = strlen (text);
+--- 2038,2060 ----
+ text = rl_copy_text (start, end);
+ matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
++ /* If TEXT contains quote characters, it will be dequoted as part of
++ generating the matches, and the matches will not contain any quote
++ characters. We need to dequote TEXT before performing the comparison.
++ Since compare_match performs the dequoting, and we only want to do it
++ once, we don't call compare_matches after dequoting TEXT; we call
++ strcmp directly. */
+ /* nontrivial_lcd is set if the common prefix adds something to the word
+ being completed. */
+! if (rl_filename_completion_desired && rl_filename_quoting_desired &&
+! rl_completion_found_quote && rl_filename_dequoting_function)
+! {
+! char *t;
+! t = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);
+! xfree (text);
+! text = t;
+! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0;
+! }
+! else
+! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0;
+ if (what_to_do == '!' || what_to_do == '@')
+ tlen = strlen (text);
+
+*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500
+--- patchlevel 2014-03-21 08:28:40.000000000 -0400
+***************
+*** 1,3 ****
+ # Do not edit -- exists only for use by patch
+
+! 9
+--- 1,3 ----
+ # Do not edit -- exists only for use by patch
+
+! 10
+++ /dev/null
-diff --git a/configure.ac b/configure.ac
-index d56d3a550..81abf8f00 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2424,7 +2424,7 @@ fi
- AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no")
- if test "$HAVE_GETCONF_CMD" != "no"; then
- CLS=$(getconf LEVEL1_DCACHE_LINESIZE)
-- if [test "$CLS" != "" && test "$CLS" != "0"]; then
-+ if [test "$CLS" != "" && test "$CLS" != "0" && test "$CLS" != "undefined"]; then
- AC_DEFINE_UNQUOTED([CLS],[${CLS}],[L1 cache line size])
- else
- AC_DEFINE([CLS],[64],[L1 cache line size])
+++ /dev/null
---- wavemon-0.9.4/Makefile.in.orig 2021-09-18 02:25:37.000000000 +0200
-+++ wavemon-0.9.4/Makefile.in 2023-05-19 23:45:50.170559365 +0200
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
-
- CC ?= @CC@
--CFLAGS ?= @CFLAGS@ @LIBNL3_CLI_CFLAGS@
-+CFLAGS = @CFLAGS@ @LIBNL3_CLI_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS ?= @LDFLAGS@
- DEFS ?= @DEFS@
--- /dev/null
+--- wavemon-0.9.5/Makefile.in.orig 2023-10-31 00:50:28.000000000 +0100
++++ wavemon-0.9.5/Makefile.in 2024-01-16 12:15:40.601709570 +0100
+@@ -15,7 +15,7 @@
+ else
+ CC ?= $(CC_DEFAULT)
+ endif
+-CFLAGS ?= @CFLAGS@ @LIBNL3_CLI_CFLAGS@
++CFLAGS = @CFLAGS@ @LIBNL3_CLI_CFLAGS@
+ CPPFLAGS ?= @CPPFLAGS@
+ LDFLAGS ?= @LDFLAGS@
+ DEFS ?= @DEFS@
echo "Comment this and create it at initskript if needed !"
fi
-grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
+grep -r 'x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
--exclude rust-ppv-lite86 --exclude rust-memchr --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 \
- --exclude update.sh \
+ --exclude update.sh --exclude qemu --exclude cmake --exclude xfsprogs \
--exclude-dir oldcore --exclude-dir x86_64 >/dev/null 2>&1
if [ "${?}" == "0" ]; then
echo "Error! '/x86_64' in rootfiles files found!"
- grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
+ grep -r 'x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
--exclude rust-ppv-lite86 --exclude rust-memchr --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 \
- --exclude update.sh \
+ --exclude update.sh --exclude qemu --exclude cmake --exclude xfsprogs \
--exclude-dir oldcore --exclude-dir x86_64
echo "Replace by xxxMACHINExxx !"
fi
-grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude gdb --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1
+grep -r 'aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude gdb \
+ --exclude qemu --exclude liburcu --exclude abseil-cpp \
+ --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1
if [ "${?}" == "0" ]; then
- echo "Error! '/aarch64' in rootfiles files found!"
- grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \
+ echo "Error! 'aarch64' in rootfiles files found!"
+ grep -r 'aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb \
+ --exclude qemu --exclude liburcu --exclude abseil-cpp \
--exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64
echo "Replace by xxxMACHINExxx !"
fi
-grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1
+grep -r 'riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude go --exclude qemu \
+ --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1
if [ "${?}" == "0" ]; then
- echo "Error! '/riscv64' in rootfiles files found!"
- grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude go \
+ echo "Error! 'riscv64' in rootfiles files found!"
+ grep -r 'riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude go --exclude qemu \
--exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64
echo "Replace by xxxMACHINExxx !"
fi
projects / people / pmueller / ipfire-2.x.git / commitdiff
