)]}' { "log": [ { "commit": "f0ab58df66fc24a8625fdff8a93bf201f1883048", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "467dd03df16db9f469caa9f0f8f37b37497d8345", "24e5ad9a4bc4ca628574b91be215be2caccd1e8b" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Dec 08 20:29:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:29:43 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: b37a9e65d0 am: 24e5ad9a4b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: If91beee1fc15257cf89032848b7f19c5128346be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "467dd03df16db9f469caa9f0f8f37b37497d8345", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "d0a51143690bc36905c06d2a4b0cbf0cc793c0ad", "05c685e485c302f051879e0cffdd9af45b0c1416" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Dec 08 20:28:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:28:31 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5 am: 0a8ee35316 am: 05c685e485\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I1a0d91477295f825e9af0f5d6297b4e7b62df99b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0a51143690bc36905c06d2a4b0cbf0cc793c0ad", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "e2563b13610396419ae6d2d28fdd5ad733d171e2", "f0d39fc4e7dc25c6e57f08d93935917959d56f39" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 08 20:27:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:27:07 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: 20799e993e am: f0d39fc4e7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I0b54f70b416904ecf6bf281e9089dba12859e44a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e2563b13610396419ae6d2d28fdd5ad733d171e2", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "65548ab9c208e4e79441fccdce22ba374a694097", "8902cb0d42754a35febbc79c077bca770c477bf1" ], "author": { "name": "Sam Saccone", "email": "samccone@google.com", "time": "Fri Dec 08 20:25:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:25:43 2023 +0000" }, "message": "Merge \"Move OWNER reference master\u003d\u003emain.\" into main am: 7c488c82e4 am: 0d290e451f am: 9d60c2999e am: 79a37135cc am: dda1fee032 am: 8902cb0d42\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2661151\n\nChange-Id: I3dc0983a277e061b254e736a54cdeb12e336c49b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "65548ab9c208e4e79441fccdce22ba374a694097", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "530cb9e57090a0d5977632862413aee0bc7cd5da", "06cfeee6a5f9cd64c7a7d2986fb418593a3095d0" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Fri Dec 08 20:24:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:24:16 2023 +0000" }, "message": "[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: 4c2e8e9be2 am: 6005106fd2 -s ours am: a89c3229ae -s ours am: 06cfeee6a5 -s ours\n\nam skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 4c2e8e9be2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874\n\nChange-Id: Id05e679ca2226ba85568aa80300eac6b4b57f9ab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "530cb9e57090a0d5977632862413aee0bc7cd5da", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "88964afd674c87264eb61972752066a06e5f69c6", "dcdd8aef878db297787b7cad7dc47357a4440aba" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Fri Dec 08 20:23:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:23:20 2023 +0000" }, "message": "[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: 4c2e8e9be2 -s ours am: 26ef810e6a -s ours am: fcc4872b6e -s ours am: dcdd8aef87 -s ours\n\nam skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 14c4d09445 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874\n\nChange-Id: I2cb6bb121566d088ba06512e3d74b5652260de55\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "88964afd674c87264eb61972752066a06e5f69c6", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "54c410d7f69c21e88b5c47822ba82e8063978d21", "700b1ce4f365a6a61128dbcf9eb1c9652381c6e7" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Fri Dec 08 20:21:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 20:21:11 2023 +0000" }, "message": "Merge \"[NFC] Move MTE mode settings to a product variable.\" am: 7a0812ebc3 am: b4fd4142a0 am: 79c7596422 am: cd890a3405 am: 42cdc39beb am: 13567c65bd am: 700b1ce4f3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2622505\n\nChange-Id: I4aa07e9e914380384bda9f6439c22d9a23c8ffde\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "24e5ad9a4bc4ca628574b91be215be2caccd1e8b", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "05c685e485c302f051879e0cffdd9af45b0c1416", "b37a9e65d09063733beedf45ddcd53b5e2f6fd46" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Dec 08 19:51:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:51:36 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: b37a9e65d0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: Ie77542db4835e8d7ef4fb5af7bcbdcdc37d16ac1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05c685e485c302f051879e0cffdd9af45b0c1416", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "f0d39fc4e7dc25c6e57f08d93935917959d56f39", "0a8ee35316eb4e4c3377f9a57a28e73a5cfb8acc" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Dec 08 19:50:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:50:48 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5 am: 0a8ee35316\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: Ic4abc1d42b83b6d0b69d5cdedb8d7f999a6e38ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f0d39fc4e7dc25c6e57f08d93935917959d56f39", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "8902cb0d42754a35febbc79c077bca770c477bf1", "20799e993e23b7650354ad61fdcdf9727e065270" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 08 19:50:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:50:00 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: 20799e993e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: Ic29afbc34238818481d65988afe57fe7770a025d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8902cb0d42754a35febbc79c077bca770c477bf1", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "06cfeee6a5f9cd64c7a7d2986fb418593a3095d0", "dda1fee032d9d1d1bae1753249f2e624e85e2b39" ], "author": { "name": "Sam Saccone", "email": "samccone@google.com", "time": "Fri Dec 08 19:49:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:49:11 2023 +0000" }, "message": "Merge \"Move OWNER reference master\u003d\u003emain.\" into main am: 7c488c82e4 am: 0d290e451f am: 9d60c2999e am: 79a37135cc am: dda1fee032\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2661151\n\nChange-Id: I17ce26d2393b5823a13ceb786a8ce8a859d40d35\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "06cfeee6a5f9cd64c7a7d2986fb418593a3095d0", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "dcdd8aef878db297787b7cad7dc47357a4440aba", "a89c3229aee7a43f78cbd0422c1c63e11d22ea42" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Fri Dec 08 19:48:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:48:26 2023 +0000" }, "message": "[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: 4c2e8e9be2 am: 6005106fd2 -s ours am: a89c3229ae -s ours\n\nam skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 4c2e8e9be2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874\n\nChange-Id: Ie85065b680c5518bca1e8582baaada5efab01e7a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dcdd8aef878db297787b7cad7dc47357a4440aba", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "700b1ce4f365a6a61128dbcf9eb1c9652381c6e7", "fcc4872b6e5c737436433124253b5e7d1a2bb760" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Fri Dec 08 19:46:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:46:55 2023 +0000" }, "message": "[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: 4c2e8e9be2 -s ours am: 26ef810e6a -s ours am: fcc4872b6e -s ours\n\nam skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 14c4d09445 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/23716874\n\nChange-Id: I99c25faab67910bfff6ff4fee479e5ac3e8f06e2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "700b1ce4f365a6a61128dbcf9eb1c9652381c6e7", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "88a3f66954a066bb1852c1f30c000bb455d86f72", "13567c65bdb026db93c98123cf43504ad4d67144" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Fri Dec 08 19:45:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 19:45:39 2023 +0000" }, "message": "Merge \"[NFC] Move MTE mode settings to a product variable.\" am: 7a0812ebc3 am: b4fd4142a0 am: 79c7596422 am: cd890a3405 am: 42cdc39beb am: 13567c65bd\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2622505\n\nChange-Id: I674d6c7e154b2e286fc67b9ecbc44d4353d855d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "54c410d7f69c21e88b5c47822ba82e8063978d21", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "fbf0a0967dc3f9cecf342bdc71d53839886ca7a7", "84c05e0b9620a059cbb5af3bd4f1fb7c9fc71a72" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:45:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:45:26 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: b37a9e65d0 am: 84c05e0b96\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I171562e08fd14edb3dc65e9ffcf2ccc696b17954\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fbf0a0967dc3f9cecf342bdc71d53839886ca7a7", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "8d481dda222418b5eb4ee2521be00377596210bf", "88a3f66954a066bb1852c1f30c000bb455d86f72" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:44:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:44:44 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: 88a3f66954\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I274ed447208d5ce363016d34fb59ca461dfe5336\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8d481dda222418b5eb4ee2521be00377596210bf", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "858bb5e6c37693f7578d3f0fb4ee60c7418f6a4c", "035796aa0568b672c5954cc7c0002db2e753a19b" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:43:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:43:37 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: 991ebe5b86 am: 035796aa05\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I2526e2889d5d0b01240ef0115b929e0427ac918d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "84c05e0b9620a059cbb5af3bd4f1fb7c9fc71a72", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "035796aa0568b672c5954cc7c0002db2e753a19b", "b37a9e65d09063733beedf45ddcd53b5e2f6fd46" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:39:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:39:00 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: b37a9e65d0\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I26d6f833a8537945c1eea1c724ad18b0b8cd2d20\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b37a9e65d09063733beedf45ddcd53b5e2f6fd46", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "0a8ee35316eb4e4c3377f9a57a28e73a5cfb8acc", "2f7a7bc2876128cb8af139be42a18ae15fa6c4d9" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:18:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:18:59 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I2cd45d9d4c0377e7ebe3f005bf20f7a5582e7cc9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "88a3f66954a066bb1852c1f30c000bb455d86f72", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "3b22e8041428d2a33076cd39f2cf1515bdbc6299", "2f7a7bc2876128cb8af139be42a18ae15fa6c4d9" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:18:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:18:49 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I86a75bc38a84058cd75222d0219e51477b35f127\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "035796aa0568b672c5954cc7c0002db2e753a19b", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "bb8c39115f63240dc9b1c492055e096e805482d3", "991ebe5b86fb37d8fd1d5d817c3b0d23ce6b9e85" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 06:17:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 06:17:09 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287 am: 991ebe5b86\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: Icb2ccde8107033c929f6a69ab9bfd5e10dcc2cc8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "991ebe5b86fb37d8fd1d5d817c3b0d23ce6b9e85", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "9f9015d4a893daddc2debfb436a382184b919e83", "2f7a7bc2876128cb8af139be42a18ae15fa6c4d9" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 05:57:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 05:57:01 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main am: 2f7a7bc287\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2800994\n\nChange-Id: I0827f2a6d8be7416b161c625355dc2a7913b3dd7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2f7a7bc2876128cb8af139be42a18ae15fa6c4d9", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "8e74bb6bb5c22858310f5414db20b67d4e206883", "85c38ce6c626efe5cd2d6770d5c0834678f78712" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 05:48:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 24 05:48:35 2023 +0000" }, "message": "Merge \"Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\" into main" }, { "commit": "858bb5e6c37693f7578d3f0fb4ee60c7418f6a4c", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "f8f9978a658d38f0fa536b968f15a0c11b53fe12", "bb8c39115f63240dc9b1c492055e096e805482d3" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:55:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:55:10 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5 am: 9f9015d4a8 am: bb8c39115f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I2355031cfe38ed5627a35c85b98470955e0acd16\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8f9978a658d38f0fa536b968f15a0c11b53fe12", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "238795d4dc88c2f17e95c118eb8deb98d1586603", "3b22e8041428d2a33076cd39f2cf1515bdbc6299" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:31:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:31:48 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5 am: 3b22e80414\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I7ece9d83129d70c5c983fa0cddaf90f60bd620b8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb8c39115f63240dc9b1c492055e096e805482d3", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "d578a9f01e52e781c2e7cfdbe5a414e1234f54b3", "9f9015d4a893daddc2debfb436a382184b919e83" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:28:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:28:17 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5 am: 9f9015d4a8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I5f36194ce8960f77ece18188b686e804f20de939\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d578a9f01e52e781c2e7cfdbe5a414e1234f54b3", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "0d05fdf1b97693bc727b1d8791114d2700eaefb5", "0a8ee35316eb4e4c3377f9a57a28e73a5cfb8acc" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:26:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:26:32 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5 am: 0a8ee35316\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: Ie5f08d0d867325ca9a7654fa48359c6b62228e30\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9f9015d4a893daddc2debfb436a382184b919e83", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "f31a4478935e895d61d34fbf69b18af2be6cf78b", "8e74bb6bb5c22858310f5414db20b67d4e206883" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:08:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:08:20 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I5c40248de1cab360c3b3e69b7f726ea6e4352f08\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0a8ee35316eb4e4c3377f9a57a28e73a5cfb8acc", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "20799e993e23b7650354ad61fdcdf9727e065270", "8e74bb6bb5c22858310f5414db20b67d4e206883" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:06:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:06:56 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I905c3a19a52fc4d56b5b74a188895de1773d8cc7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b22e8041428d2a33076cd39f2cf1515bdbc6299", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "367ce4e075356677bcf5e7bfb792d2bd04dc7b9c", "8e74bb6bb5c22858310f5414db20b67d4e206883" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 03:06:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 24 03:06:42 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main am: 8e74bb6bb5\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2799843\n\nChange-Id: I613e1b0798ffcce14c4476d6b5f5914f7e022a70\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "85c38ce6c626efe5cd2d6770d5c0834678f78712", "tree": "c13472d6baa12a26b2427a040b642a7524fa6aa2", "parents": [ "8e74bb6bb5c22858310f5414db20b67d4e206883" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 02:55:59 2023 +0000" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 02:58:29 2023 +0000" }, "message": "Revert \"ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\"\n\nThis reverts commit 97823ea15ca277ec723a02bc9d4081be5dc3037c.\n\nReason for revert: no longer needed after bionic header update\n\nChange-Id: If9641bbc2462a43e91f26d59957d66e55dea42c9\n" }, { "commit": "8e74bb6bb5c22858310f5414db20b67d4e206883", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "3dd590f33377ffa97da0aca046e4efc5211ef616", "409e57db117575af8e21becab7b8218ba19efbc3" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Oct 24 02:55:18 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 24 02:55:18 2023 +0000" }, "message": "Merge changes from topics \"ipt1810\", \"ipt189\" into main\n\n* changes:\n Merge branch \u0027master\u0027 of https://git.netfilter.org/iptables\n bump to 1.8.10\n Merge tag \u0027v1.8.10\u0027 of https://git.netfilter.org/iptables\n ANDROID: unconditionally use \u0027all\u0027 for proto 0\n ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\n include: Add missing linux/netfilter/xt_LOG.h\n bump to 1.8.9\n Merge upstream at one commit past 1.8.9 at ed4082a7405a5838c205a34c1559e289949200cc\n Merge tag \u0027v1.8.9\u0027 of https://git.netfilter.org/iptables\n" }, { "commit": "238795d4dc88c2f17e95c118eb8deb98d1586603", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "cd1ae209f231e700e10477d58bc617307c3fba00", "0d05fdf1b97693bc727b1d8791114d2700eaefb5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 20:20:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 20:20:34 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: f31a447893 am: 0d05fdf1b9\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I4612137d5691eebafd9ad6ebab91941fb11f1dee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd1ae209f231e700e10477d58bc617307c3fba00", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "b9c72ee0ce8d908adc28233a275f641fb479981f", "4463bce0c7d01abf73a92bb6e2bedf358794a2e5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 20:19:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 20:19:45 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: 20799e993e am: 4463bce0c7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I95355669bcae23f90df28cf9ffc0d8fd9ba5d92e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0d05fdf1b97693bc727b1d8791114d2700eaefb5", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "4463bce0c7d01abf73a92bb6e2bedf358794a2e5", "f31a4478935e895d61d34fbf69b18af2be6cf78b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 19:30:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 19:30:34 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: f31a447893\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I6a809794febb074fa8aa86cb05347fa9f2523abe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4463bce0c7d01abf73a92bb6e2bedf358794a2e5", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "dda1fee032d9d1d1bae1753249f2e624e85e2b39", "20799e993e23b7650354ad61fdcdf9727e065270" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 19:29:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 19:29:30 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: 20799e993e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: Ib60a0cf211acedce80c944f77f4a76a3c22bd7ef\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f31a4478935e895d61d34fbf69b18af2be6cf78b", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "9d60c2999e363fdefc7d8c26452dfa93c83c7ba9", "3dd590f33377ffa97da0aca046e4efc5211ef616" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 18:50:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 18:50:07 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: Icc7699c21ba99281549edfde6b2273dc8233f500\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "20799e993e23b7650354ad61fdcdf9727e065270", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "dda1fee032d9d1d1bae1753249f2e624e85e2b39", "3dd590f33377ffa97da0aca046e4efc5211ef616" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 18:49:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 18:49:47 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I96a546e9e0a5ea63da7bc0e5cd991f3bd9b60997\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b9c72ee0ce8d908adc28233a275f641fb479981f", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "4f02a8a3ee1ff8c0ce5e8014898f4f8209e41689", "367ce4e075356677bcf5e7bfb792d2bd04dc7b9c" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 18:49:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 18:49:24 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333 am: 367ce4e075\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I99939036c33aa85a754fe114da0ae1b9b57f6753\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "367ce4e075356677bcf5e7bfb792d2bd04dc7b9c", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "e99c72d752638b55c64a38706446b1d2744b3342", "3dd590f33377ffa97da0aca046e4efc5211ef616" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 18:25:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 23 18:25:37 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950\n\nChange-Id: I9a2d6c7fb1cb57743fb349953bf7d84d4a0ac149\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "409e57db117575af8e21becab7b8218ba19efbc3", "tree": "45b4c93d87b3c713f64d4f1456de1e84b9ad0c6b", "parents": [ "d8513a9276f7b1e76139a8cfc25f84d6a86532ef", "920ece2b392fb83bd26416e0e6f8f6a847aacbaa" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:11:18 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:11:26 2023 -0700" }, "message": "Merge branch \u0027master\u0027 of https://git.netfilter.org/iptables\n\n* \u0027master\u0027 of https://git.netfilter.org/iptables:\n extensions: string: Clarify description of --to\n libiptc: Fix for another segfault due to chain index NULL pointer\n\nGenerated via:\n git fetch git://git.netfilter.org/iptables master\n git merge --log\u003d999 FETCH_HEAD\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I48d98fcfc9345d212db6313e8fcd8ceeca229d30\n" }, { "commit": "d8513a9276f7b1e76139a8cfc25f84d6a86532ef", "tree": "0f4f7d8472dab5d9365cb6e72b14a4d0551ddcdd", "parents": [ "6ca2997edebc1642a7c5849b1e6d9e7996941321" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sun Oct 22 10:57:43 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:11:04 2023 -0700" }, "message": "bump to 1.8.10\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ic32f5441bea2680b95dacac764a56d63f0283f69\n" }, { "commit": "6ca2997edebc1642a7c5849b1e6d9e7996941321", "tree": "23cc33747464a209477297192bf8ab73b10b53c9", "parents": [ "9122b27635055a26c8a1d336bcf7382945dc576f", "8ae55c2a331e932c0aeef8c6c138bf60deb9fd42" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:10:01 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:10:41 2023 -0700" }, "message": "Merge tag \u0027v1.8.10\u0027 of https://git.netfilter.org/iptables\n\niptables 1.8.10 release\n\n* tag \u0027v1.8.10\u0027 of https://git.netfilter.org/iptables:\n configure: Bump version for 1.8.10 release\n build: Bump dependency on libnftnl\n include: linux: Update kernel.h\n nft: Fix for useless meta expressions in rule\n tests: shell: Fix for ineffective 0007-mid-restore-flush_0\n extensions: Fix checking of conntrack --ctproto 0\n Revert --compat option related commits\n doc: fix example of xt_cpu\n tests: Test compat mode\n Add --compat option to *tables-nft and *-nft-restore commands\n nft: Introduce and use bool nft_handle::compat\n nft: Pass nft_handle to add_{target,action}()\n Use SOCK_CLOEXEC/O_CLOEXEC where available\n tests: shell: Test chain policy counter behaviour\n Revert \"libiptc: fix wrong maptype of base chain counters on restore\"\n nft: Create builtin chains with counters enabled\n tests: iptables-test: Fix command segfault reports\n nft-ruleparse: parse meta mark set as MARK target\n nft-ruleparse: Introduce nft_create_target()\n extensions: libip6t_icmp: Add names for mld-listener types\n nft: move processing logic out of asserts\n man: iptables-save.8: Start paragraphs in upper-case\n man: iptables-save.8: Fix --modprobe description\n man: iptables-save.8: Clarify \u0027available tables\u0027\n man: Trivial: Missing space after comma\n man: iptables-restore.8: Start paragraphs in upper-case\n man: iptables-restore.8: Put \u0027file\u0027 in italics in synopsis\n man: iptables-restore.8: Drop -W option from synopsis\n man: iptables-restore.8: Consistently document -w option\n man: iptables-restore.8: Fix --modprobe description\n man: iptables.8: Trivial font fixes\n man: Use HTTPS for links to netfilter.org\n man: iptables.8: Clarify --goto description\n man: iptables.8: Fix intra page reference\n man: iptables.8: Trivial spelling fixes\n man: iptables.8: Extend exit code description\n tests: libipt_icmp.t: Enable tests with numeric output\n extensions: libipt_icmp: Fix confusion between 255/255 and any\n iptables-apply: Eliminate shellcheck warnings\n iptables-restore: Drop dead code\n tests: shell: Fix and extend chain rename test\n ebtables: Improve invalid chain name detection\n *tables: Reject invalid chain names when renaming\n *tables-restore: Enforce correct counters syntax if present\n nft: Include sets in debug output\n nft: Do not pass nft_rule_ctx to add_nft_among()\n nft: More verbose extension comparison debugging\n nft: Special casing for among match in compare_matches()\n tests: shell: Sanitize nft-only/0009-needless-bitwise_0\n nft-bridge: pass context structure to ops-\u003eadd() to improve anonymous set support\n iptables: Fix handling of non-existent chains\n iptables: Fix setting of ipv6 counters\n xshared: dissolve should_load_proto\n nft: use payload matching for layer 4 protocol\n man: string: document BM false negatives\n nft: check for source and destination address in first place\n nft: ruleparse: Create family-specific source files\n nft: Extract rule parsing callbacks from nft_family_ops\n nft: Introduce nft-ruleparse.{c,h}\n xshared: Fix parsing of option arguments in same word\n arptables: Don\u0027t omit standard matches if inverted\n arptables: Fix parsing of inverted \u0027arp operation\u0027 match\n nft-shared: Drop unused include\n utils: nfbpf_compile: Replace pcap_compile_nopcap()\n tests: shell: Test for false-positive rule check\n ebtables-nft: add broute table emulation\n include: update nf_tables uapi header\n build: use pkg-config for libpcap\n ip6tables: Fix checking existence of rule\n iptables-test.py: make explicit use of python3\n iptables-nft: remove unused function argument\n iptables-nft: make builtin tables static\n xtables-eb: fix crash when opts isn\u0027t reallocated\n nft-restore: Fix for deletion of new, referenced rule\n include: Add missing linux/netfilter/xt_LOG.h\n xt_sctp: add the missing chunk types in sctp_help\n xtables-translate: Support insert with index\n ebtables: ip and ip6 matches depend on protocol match\n extensions: libebt_ip: Translation has to match on ether type\n extensions: libebt_ip: Do not use \u0027ip dscp\u0027 for translation\n extensions: libebt_redirect: Fix for wrong syntax in translation\n extensions: libebt_redirect: Fix target translation\n tests: xlate: Print file names even if specified\n tests: xlate: Properly split input in replay mode\n nft-shared: Simplify using nft_create_match()\n nft-shared: Use nft_create_match() in one more spot\n nft-shared: Lookup matches in iptables_command_state\n tests: CLUSTERIP: Drop test file\n tests: xlate: Support testing multiple individual files\n ebtables-translate: Print flush command after parsing is finished\n ebtables-translate: Ignore \u0027-j CONTINUE\u0027\n ebtables-translate: Use OPT_* from xshared.h\n ebtables-translate: Drop exec_style\n ebtables: Refuse unselected targets\u0027 options\n Proper fix for \"unknown argument\" error message\n etc: Drop xtables.conf\n\nGenerated via:\n git fetch git://git.netfilter.org/iptables v1.8.10\n git merge --log\u003d999 FETCH_HEAD\n\nTest: with follow up\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ia4ce7e3670706ee0905228cfd147fa6499ca08bb\n" }, { "commit": "9122b27635055a26c8a1d336bcf7382945dc576f", "tree": "7427658b9989595235627a93e0023b4b5c38d62c", "parents": [ "97823ea15ca277ec723a02bc9d4081be5dc3037c" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sun Oct 22 01:16:19 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:06:27 2023 -0700" }, "message": "ANDROID: unconditionally use \u0027all\u0027 for proto 0\n\n0 actually meaning \u0027all\u0027 is special, since 0 actually means IPPROTO_HOPOPTS\n\nTests updated via:\n sed -ri \u0027s@0 --@all --@g\u0027 iptables/tests/shell/testcases/*/*{output,line}*\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I243de287dd15e9cd853cc08f840953610a8f0bf4\n" }, { "commit": "97823ea15ca277ec723a02bc9d4081be5dc3037c", "tree": "a6f49cca60c8c3bcde085d3891c23dd5c68ec7e6", "parents": [ "0b40e0cb0eaaeb50db17a4b31dfa18b2673334bb" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 19:43:59 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:04:56 2023 -0700" }, "message": "ANDROID: extensions/libxt_LOG.c: manually define prioritynames[]\n\nThis is based on looking at:\n https://git.netfilter.org/iptables/commit/?h\u003dv1.8.10\u0026id\u003d87e4f1bf0b87b23f0fe29e5f9976d64843de8785\n\nTest: builds, but the following fail:\n $ atest NetdBinderTest IptablesRestoreControllerTest\n NetdBinderTest#TetherGetStats\n NetdBinderTest#StrictSetUidCleartextPenalty\n NetdBinderTest#FirewallSetFirewallType\n NetdBinderTest#FirewallSetInterfaceRule\n NetdBinderTest#TetherForwardAddRemove\n IptablesRestoreControllerTest#TestCommandTimeout\n\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Id55f855d05c8f0e9b7a01a881da3cc4b211341ae\n" }, { "commit": "0b40e0cb0eaaeb50db17a4b31dfa18b2673334bb", "tree": "a4c6fe636b8ec08820b9b1f8a15243411e03439f", "parents": [ "6e18c5e43a73ff31d89258254984999babe11c8b" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Feb 22 16:36:16 2023 +0100" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Oct 23 11:04:41 2023 -0700" }, "message": "include: Add missing linux/netfilter/xt_LOG.h\n\nWhen merging IP-version-specific LOG extensions, a dependency to that\nheader was introduced without caching it. Fix this and drop the now\nunused ip{,6}t_LOG.h files.\n\nReported-by: Thomas Devoogdt \u003cthomas@devoogdt.com\u003e\nFixes: 87e4f1bf0b87b (\"extensions: libip*t_LOG: Merge extensions\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I58da200a4ee3ee1529c00e617d67358a4b1c39a9\n(cherry picked from commit 8030e5444681e16ac2f481ddad73e33fab376147)\n" }, { "commit": "3dd590f33377ffa97da0aca046e4efc5211ef616", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "0d290e451f94c80c0b11ed43c6f478dccea30047", "e8e214de4857d38e0d771e25dade6e810586a132" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 23 18:02:07 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 23 18:02:07 2023 +0000" }, "message": "Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main\n\n* changes:\n Merge upstream at one commit past 1.8.8 at b72eb12ea5a61df0655ad99d5048994e916be83a\n bump to 1.8.8\n Merge tag \u0027v1.8.8\u0027 of https://git.netfilter.org/iptables\n Revert \"ANDROID: fix build for missing ETH_ALEN definition\"\n iptables: reenable \u0027pointer-bool-conversion\u0027 warning\n" }, { "commit": "6e18c5e43a73ff31d89258254984999babe11c8b", "tree": "ac95a94eba278f686320128ee3ce61d1dff5cc9f", "parents": [ "0c3a0d44bd7b3b2945d7b9722902709d02bd1bb5" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 18:34:19 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 18:35:11 2023 -0700" }, "message": "bump to 1.8.9\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I30fd835c7779778581e605bd0bd82bbec5de8265\n" }, { "commit": "0c3a0d44bd7b3b2945d7b9722902709d02bd1bb5", "tree": "e947421cfb340f3616505bbdba0e154091e784ab", "parents": [ "598457c9f2b2c700b4b077f0d1d42be54b5fe525", "ed4082a7405a5838c205a34c1559e289949200cc" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 18:32:48 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 18:33:04 2023 -0700" }, "message": "Merge upstream at one commit past 1.8.9 at ed4082a7405a5838c205a34c1559e289949200cc\n\nThis simply pulls in commit ed4082a7405a5838c205a34c1559e289949200cc:\n extensions: NAT: Fix for -Werror\u003dformat-security\nwhich is needed to prevent build error.\n\nTest: with series\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I651c744775b9d3dc6637c720dbfc7794feb40687\n" }, { "commit": "598457c9f2b2c700b4b077f0d1d42be54b5fe525", "tree": "4cc72af4550a0f207b774669415e2273892a45d7", "parents": [ "e8e214de4857d38e0d771e25dade6e810586a132", "11407d91a1bece630e0e1f2063ce726e4045827d" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 18:31:17 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 18:31:56 2023 -0700" }, "message": "Merge tag \u0027v1.8.9\u0027 of https://git.netfilter.org/iptables\n\niptables 1.8.9 release\n\n* tag \u0027v1.8.9\u0027 of https://git.netfilter.org/iptables:\n configure: Bump version for 1.8.9 release\n Makefile: Replace brace expansion\n ebtables-translate: Install symlink\n gitignore: Ignore generated ip6tables man pages\n gitignore: Ignore utils/nfsynproxy\n nft: Reject tcp/udp extension without proper protocol match\n nft: Make rule parsing errors fatal\n nft: Increase rule parser strictness\n arptables: Check the mandatory ar_pln match\n nft: Parse icmp header matches\n Makefile.am: Integrate testsuites\n tests: Adjust testsuite return codes to automake guidelines\n include/Makefile: xtables-version.h is generated\n Makefile: Generate .tar.xz archive with \u0027make dist\u0027\n Makefile: Fix for \u0027make distcheck\u0027\n iptables/Makefile: Split nft-variant man page list\n iptables/Makefile: Reorg variable assignments\n extensions: Makefile: Merge initext targets\n Makefile: Generate ip6tables man pages on the fly\n Drop libiptc/linux_stddef.h\n Drop INCOMPATIBILITIES file\n Makefile: Create LZMA-compressed dist-files\n ebtables: Fix MAC address match translation\n xtables-translate: Fix for interfaces with asterisk mid-string\n nft: Recognize INVAL/D interface name\n nft: Fix match generator for \u0027! -i +\u0027\n nft: Fix for comparing ifname matches against nft-generated ones\n tests: xlate: Use --check to verify replay\n ebtables: Implement --check command\n libiptc: Eliminate garbage access\n xshared: Free data after printing help\n iptables: Properly clear iptables_command_state object\n xtables: Introduce xtables_clear_iptables_command_state()\n iptables: Plug memleaks in print_firewall()\n nft: Plug memleak in nft_rule_zero_counters()\n iptables-xml: Free allocated chain strings\n iptables-restore: Free handle with --test also\n tests: shell: Fix valgrind mode for 0008-unprivileged_0\n extensions: add xt_statistics random mode translation\n nft-bridge: work around recent \"among\" decode breakage\n xlate-test: avoid shell entanglements\n extensions: change expected output for new format\n xlate: get rid of escape_quotes\n tests: shell: Test selective ebtables flushing\n extensions: xlate: Format sets consistently\n extensions: libxt_conntrack: Drop extra whitespace in xlate\n extensions: Leverage xlate auto-spacing\n libxtables: xt_xlate_add() to take care of spacing\n extensions: ipcomp: Add comment to clarify xlate callback\n extensions: frag: Add comment to clarify xlate callback\n extensions: libebt_log: Add comment to clarify xlate callback\n extensions: tcp: Translate TCP option match\n extensions: ecn: Sanitize xlate callback\n extensions: TOS: Fix v1 xlate callback\n extensions: TCPMSS: Use xlate callback for IPv6, too\n extensions: MARK: Sanitize MARK_xlate()\n extensions: CONNMARK: Fix xlate callback\n extensions: libipt_ttl: Sanitize xlate callback\n extensions: libebt_redirect: Fix xlate return code\n extensions: libebt_mark: Fix xlate test case\n extensions: libebt_mark: Fix mark target xlate\n iptables-nft: exit nonzero when iptables-save cannot decode all expressions\n nft: check for unknown meta keys\n extensions: mark: Test double bitwise in a rule\n nft-shared: replace nftnl_expr_get_data() by nftnl_expr_get()\n nft: replace nftnl_.*_nlmsg_build_hdr() by nftnl_nlmsg_build_hdr()\n Drop extra newline from xtables_error() calls\n extensions: Unify ICMP parser into libxt_icmp.h\n extensions: Collate ICMP types/codes in libxt_icmp.h\n extensions: libebt_arp, libebt_ip: Use xtables_ipparse_any()\n extensions: libebt_ip: Include kernel header\n extensions: libip*t_LOG: Merge extensions\n nft-shared: Introduce port_match_single_to_range()\n xshared: Share make_delete_mask() between ip{,6}tables\n tests: xlate-test: Replay results for reverse direction testing\n tests: xlate-test.py: Introduce run_proc()\n tests: xlate-test: Cleanup file reading loop\n extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE\n extensions: DNAT: Rename some symbols\n extensions: DNAT: Generate print, save and xlate callbacks\n extensions: DNAT: Use __DNAT_xlate for REDIRECT, too\n extensions: *NAT: Drop NF_NAT_RANGE_PROTO_RANDOM* flag checks\n extensions: DNAT: Fix bad IP address error reporting\n tests: *.t: Add missing all-one\u0027s netmasks to expected output\n tests: libxt_connlimit.t: Add missing default values\n tests: libebt_vlan.t: Drop trailing whitespace from rules\n tests: libxt_tos.t, libxt_TOS.t: Add missing masks in output\n tests: libxt_recent.t: Add missing default values\n tests: libxt_length.t: Fix odd use-case output\n tests: libebt_redirect.t: Plain redirect prints with trailing whitespace\n tests: *.t: Fix for hexadecimal output\n tests: *.t: Fix expected output for simple calls\n tests: iptables-test: Cover for obligatory -j CONTINUE in ebtables\n tests: iptables-test: Implement fast test mode\n extensions: NFQUEUE: Document queue-balance limitation\n nft: Fix compile with -DDEBUG\n libiptc: Fix for segfault when renaming a chain\n tests: shell: Fix expected ebtables log target output\n tests: shell: Fix expected output for ip6tables dst match\n tests: libebt_stp.t: Drop duplicate whitespace\n tests: IDLETIMER.t: Fix syntax, support for restore input\n extensions: libebt_log: Avoid empty log-prefix in output\n extensions: TCPOPTSTRIP: Do not print empty options\n extensions: libip6t_dst: Fix output for empty options\n extensions: libebt_stp: Eliminate duplicate space in output\n extensions: among: Fix for use with ebtables-restore\n extensions: among: Remove pointless fall through\n tests: iptables-test: Test both variants by default\n tests: iptables-test: Pass netns to execute_cmd()\n tests: iptables-test: Simplify execute_cmd() calling\n tests: iptables-test: Simplify \u0027-N\u0027 option a bit\n nft-bridge: Drop \u0027sreg_count\u0027 variable\n nft: Fix meta statement parsing\n ebtables: Fix among match\n ebtables: Support \u0027-p Length\u0027\n nft-shared: Introduce __get_cmp_data()\n ebtables: Merge OPT_* flags with xshared ones\n ebtables: Eliminate OPT_TABLE\n ebtables: Drop unused OPT_* defines\n tests: extend native delinearize script\n nft: track each register individually\n tests: shell: Test delinearization of native nftables expressions\n Revert \"nft: prefer payload to ttl/hl module\"/\u0027meta pkttype\u0027 match.\n nft: un-break among match with concatenation\n nft: prefer payload to ttl/hl module\n nft: support ttl/hoplimit dissection\n extensions: libxt_pkttype: support otherhost\n nft: prefer native \u0027meta pkttype\u0027 instead of xt match\n nft: support dissection of meta pkktype mode\n nft: Expand extended error reporting to nft_cmd, too\n xtables-restore: Extend failure error message\n tests: add ebtables among testcase\n nft: fix ebtables among match when mac+ip addresses are used\n xshared: Print protocol numbers if --numeric was given\n xshared: Fix for missing space after \u0027prot\u0027 column\n tests: shell: Fix testcases for changed ip6tables opts output\n iptables: xshared: Ouptut \u0027--\u0027 in the opt field in ipv6\u0027s fake mode\n extensions: libxt_conntrack: remove always-false conditionals\n xt_sctp: support a couple of new chunk types\n libxtables: Fix unsupported extension warning corner case\n netfilter: add nf_log.h\n libxtables: Define XT_OPTION_OFFSET_SCALE in xtables.h\n libxtables: Move struct xtables_afinfo into xtables.h\n xtables-monitor: add missing spaces in printed str\n nft: Exit if nftnl_alloc_expr fails\n iptables.8: mention that iptables exits when setuid\n extensions: string: Fix and enable tests\n extensions: string: Review parse_string() function\n extensions: string: Do not print default --to value\n ebtables-restore: Deny --init-table\n extensions: libebt_standard.t: Test logical-{in,out} as well\n tests: shell: Extend zero counters test a bit further\n tests: shell: Extend iptables-xml test a bit\n tests: shell: Add some more rules to 0002-verbose-output_0\n Makefile: Add --enable-profiling configure option\n xshared: Make some functions static\n iptables-legacy: Drop redundant include of xtables-multi.h\n arptables: Support -x/--exact flag\n libxtables: Unexport init_extensions*() declarations\n tests: shell: Check overhead in iptables-save and -restore\n build: Fix error during out of tree build\n Revert \"fix build for missing ETH_ALEN definition\"\n treewide: use uint* instead of u_int*\n\nGenerated via:\n git fetch git://git.netfilter.org/iptables v1.8.9\n git merge --log\u003d999 FETCH_HEAD\n\nTest: with follow up\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I3968bfa48aefd8d8c0adcfb4da27a1507299548b\n" }, { "commit": "e8e214de4857d38e0d771e25dade6e810586a132", "tree": "bf90895fed6aa9e1cfbc2958546392e03242a933", "parents": [ "68c02e4c8ac48136e830c636bda64da13a36ecd1", "b72eb12ea5a61df0655ad99d5048994e916be83a" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 17:08:47 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 17:10:17 2023 -0700" }, "message": "Merge upstream at one commit past 1.8.8 at b72eb12ea5a61df0655ad99d5048994e916be83a\n\nThis simply pulls in commit b72eb12ea5a61df0655ad99d5048994e916be83a:\n xshared: Fix build for -Werror\u003dformat-security\n\nWhich is needed to prevent a build error:\n external/iptables/iptables/xshared.c:1310:36: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]\n xtables_error(PARAMETER_PROBLEM, msg);\n ^~~\n external/iptables/iptables/xshared.c:1310:36: note: treat the string as an argument to avoid this\n xtables_error(PARAMETER_PROBLEM, msg);\n ^\n \"%s\",\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: If212f60014da60320c56b9ecea1a5f90de292ec7\n" }, { "commit": "68c02e4c8ac48136e830c636bda64da13a36ecd1", "tree": "dd522224995d06bb14862289cf297bda0bf3daed", "parents": [ "aef4e33f8ca21b0569497d0864babf8acb39e952" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:45:33 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:47:01 2023 -0700" }, "message": "bump to 1.8.8\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ibbedf6e78258e1f0ab77f4a615004e818ffd3fe4\n" }, { "commit": "aef4e33f8ca21b0569497d0864babf8acb39e952", "tree": "2c78f14582dbde3cdbd045d2180010b0206bea51", "parents": [ "f171d14045ae633eb2aa6cf52e3f330b5b5f6cc7", "fa0ccdbdbec467ee6a562d5de38eaaefa1016ad7" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:43:49 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:46:32 2023 -0700" }, "message": "Merge tag \u0027v1.8.8\u0027 of https://git.netfilter.org/iptables\n\niptables 1.8.8 release\n\n* tag \u0027v1.8.8\u0027 of https://git.netfilter.org/iptables:\n configure: bump version for 1.8.8 release\n nft: Fix EPERM handling for extensions without rev 0\n extensions: LOG: Document --log-macdecode in man page\n man: *NAT: Review --random* option descriptions\n extensions: DNAT: Merge core printing functions\n libxtables: Revert change to struct xtables_pprot\n libxtables: Drop xtables_globals \u0027optstring\u0027 field\n xshared: Extend xtables_printhelp() for arptables\n xshared: Move arp_opcodes into shared space\n extensions: MARK: Drop extra newline at end of help\n nft: split gen_payload() to allocate register and initialize expression\n nft: prepare for dynamic register allocation\n nft: pass handle to helper functions to build netlink payload\n nft: native mark matching support\n nft: pass struct nft_xt_ctx to parse_meta()\n nft-shared: update context register for bitwise expression\n extensions: man: Document service name support in DNAT and REDIRECT\n extensions: Merge REDIRECT into DNAT\n extensions: Merge IPv4 and IPv6 DNAT targets\n extensions: DNAT: Rename from libipt to libxt\n extensions: ipt_DNAT: Combine xlate functions also\n extensions: ipt_DNAT: Merge v1/v2 print/save code\n extensions: ipt_DNAT: Merge v1 and v2 parsers\n Revert \"libipt_[SD]NAT: avoid false error about multiple destinations specified\"\n man: DNAT: Describe shifted port range feature\n xlate-test: Fix for empty source line on failure\n libxtables: Boost rule target checks by announcing chain names\n libxtables: Implement notargets hash table\n nft: Reject standard targets as chain names when restoring\n tests: shell: Fix 0004-return-codes_0 for static builds\n nft: Review static extension loading\n xtables: Call init_extensions{,a,b}() for static builds\n Simplify static build extension loading\n libxtables: Fix for warning in xtables_ipmask_to_numeric\n nft: Don\u0027t pass command state opaque to family ops callbacks\n xshared: Prefer xtables_chain_protos lookup over getprotoent\n nft: Speed up immediate parsing\n nft: Simplify immediate parsing\n Improve error messages for unsupported extensions\n libxtables: Register only the highest revision extension\n xshared: Implement xtables lock timeout using signals\n tests: NFLOG: enable `--nflog-range` tests\n tests: support explicit variant test result\n tests: add `NOMATCH` test result\n tests: iptables-test: rename variable\n iptables.8: Describe the effect of multiple -v flags\n tests: iptables-test: Support variant deviation\n nft: cache: Dump rules if debugging\n nft: Add debug output to table creation\n ebtables: Support verbose mode\n nft: Set NFTNL_CHAIN_FAMILY in new chains\n iptables-restore: Support for extra debug output\n nft: Use verbose flag to toggle debug output\n nft: add support for native tcp flag matching\n nft-shared: add tcp flag dissection\n nft: prefer native expressions instead of tcp match\n nft: prefer native expressions instead of udp match\n nft-shared: support native udp port delinearize\n nft-shared: support native tcp port range delinearize\n nft-shared: support native tcp port delinearize\n extensions: libxt_NFLOG: fix typo\n xshared: Fix response to unprivileged users\n build: replace `AM_PROG_LIBTOOL` and `AC_DISABLE_STATIC` with `LT_INIT`\n extensions: libxt_NFLOG: remove extra space when saving targets with prefixes\n extensions: libxt_NFLOG: fix `--nflog-prefix` Python test-cases\n extensions: libxt_NFLOG: disable `--nflog-range` Python test-cases\n extensions: libxt_NFLOG: don\u0027t truncate log prefix on print/save\n extensions: libxt_NFLOG: use nft built-in logging instead of xt_NFLOG\n extensions: *NAT: Kill multiple IPv4 range support\n tests: iptables-test: correct misspelt variable\n nft: fix indentation error.\n ip6tables: Use the shared do_parse, too\n iptables: Use xtables\u0027 do_parse() function\n nft: Move proto_parse and post_parse callbacks to xshared\n xshared: Store parsed wait and wait_interval in xtables_args\n xshared: Move do_parse to shared space\n xtables: Do not pass nft_handle to do_parse()\n xtables: Pass xtables_args to check_inverse()\n xtables: Pass xtables_args to check_empty_interface()\n xtables: Move struct nft_xt_cmd_parse to xshared.h\n xtables: Pull table validity check out of do_parse()\n xtables: Drop xtables\u0027 family on demand feature\n nft-shared: set correct register value\n iptables-*-restore: Drop pointless line reference\n libxtables: Extend basic_exit_err()\n xtables_globals: Embed variant name in .program_version\n xshared: Share exit_tryhelp()\n xshared: Share a common printhelp function\n xshared: Share print_match_save() between legacy ip*tables\n extensions: tcpmss: add iptables-translate support\n xshared: Make load_proto() static\n nft-shared: Drop unused function print_proto()\n xshared: Share print_header() with legacy iptables\n xshared: Share print_fragment() with legacy\n xshared: Share print_rule_details() with legacy\n xshared: Share save_ipv{4,6}_addr() with legacy\n xshared: Share save_rule_details() with legacy\n xshared: Share print_iface() function\n nft: Change whitespace printing in save_rule callback\n xshared: Merge and share parse_chain()\n extensions: hashlimit: Fix tests with HZ\u003d1000\n xlate-test: Print full path if testing all files\n Unbreak xtables-translate\n nft: Merge xtables-arp-standalone.c into xtables-standalone.c\n xtables: arptables accepts empty interface names\n xtables: Derive xtables_globals from family\n nft-shared: Make nft_check_xt_legacy() family agnostic\n nft-arp: Introduce post_parse callback\n arptables: Use standard data structures when parsing\n libxtables: Introduce xtables_globals print_help callback\n xtables-standalone: Drop version number from init errors\n nft: Add family ops callbacks wrapping different nft_cmd_* functions\n xtables: Simplify addr_mask freeing\n nft-shared: Introduce init_cs family ops callback\n xshared: Store optstring in xtables_globals\n nft: Introduce builtin_tables_lookup()\n tests: shell: fix bashism\n nft: Delete builtin chains compatibly\n nft-chain: Introduce base_slot field\n nft: Check base-chain compatibility when adding to cache\n nft: cache: Avoid double free of unrecognized base-chains\n xtables-translate: add missing argument and option to usage\n tests: iptables-test: Fix conditional colors on stderr\n ebtables: Avoid dropping policy when flushing\n iptables-test.py: print with color escapes only when stdout isatty\n tests: shell: Return non-zero on error\n tests: iptables-test: Exit non-zero on error\n tests: xlate-test: Exit non-zero on error\n tests: iptables-test: Print errors to stderr\n tests: xlate-test: Print errors to stderr\n tests: xlate-test: Don\u0027t skip any input after the first empty line\n tests: iptables-test: Fix missing chain case\n iptables-nft: allow removal of empty builtin chains\n Fix a few doc typos\n nft: Use xtables_{m,c}alloc() everywhere\n nft: Use xtables_malloc() in mnl_err_list_node_add()\n extensions: libxt_mac: Fix for missing space in listing\n iptables-test: Make netns spawning more robust\n extensions: hashlimit: Fix tests with HZ\u003d100\n ip6tables: masquerade: use fully-random so that nft can understand the rule\n libxtables: exit if called by setuid executeable\n tests/shell: Assert non-verbose mode is silent\n nft: Fix for non-verbose check command\n ebtables: Dump atomic waste\n doc: ebtables-nft.8: Adjust for missing atomic-options\n xtables: Call init_extensions6() for static builds\n extensions: libxt_multiport: add translation for -m multiport --ports\n extensions: libxt_conntrack: simplify translation using negation\n extensions: libxt_tcp: rework translation to use flags match representation\n extensions: libxt_connlimit: add translation\n tests: xlate-test: support multiline expectation\n libxtables: extend xlate infrastructure\n extensions: libxt_string: Avoid buffer size warning for strncpy()\n libxtables: Introduce xtables_strdup() and use it everywhere\n extensions: libebt_ip6: Use xtables_ip6parse_any()\n iptables-apply: Drop unused variable\n nft: Avoid buffer size warnings copying iface names\n nft: Avoid memleak in error path of nft_cmd_new()\n libxtables: Fix memleak in xtopt_parse_hostmask()\n extensions: libebt_ip6: Drop unused variables\n libxtables: Drop leftover variable in xtables_numeric_to_ip6addr()\n extensions: sctp: Translate --chunk-types option\n extensions: sctp: Fix nftables translation\n Use proto_to_name() from xshared in more places\n ebtables-translate: Use shared ebt_get_current_chain() function\n xshared: Merge invflags handling code\n xshared: Eliminate iptables_command_state-\u003einvert\n xtables: Make invflags 16bit wide\n extensions: SECMARK: Implement revision 1\n nft-arp: Make use of ipv4_addr_to_string()\n Eliminate inet_aton() and inet_ntoa()\n extensions: sctp: Explain match types in man page\n nft: Increase BATCH_PAGE_SIZE to support huge rulesets\n nft: cache: Sort chains on demand only\n fix build for missing ETH_ALEN definition\n extensions: libxt_conntrack: use bitops for status negation\n extensions: libxt_conntrack: use bitops for state negation\n libxtables: Simplify xtables_ipmask_to_cidr() a bit\n xtables-translate: Fix translation of odd netmasks\n nft: Fix bitwise expression avoidance detection\n iptables-nft: fix -Z option\n include: Drop libipulog.h\n ebtables: Exit gracefully on invalid table names\n\nGenerated via:\n git fetch git://git.netfilter.org/iptables v1.8.8\n git merge --log\u003d999 FETCH_HEAD\n\nTest: with follow up\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I7f10813f886cc0530245aca27e051435e3bb53fe\n" }, { "commit": "f171d14045ae633eb2aa6cf52e3f330b5b5f6cc7", "tree": "c9aa08ff993c29bbd0539e25f33e6e3cf2085954", "parents": [ "6b1a394b2280d233d8e96c8e92deb1c5125b1ad2" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:42:40 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:43:35 2023 -0700" }, "message": "Revert \"ANDROID: fix build for missing ETH_ALEN definition\"\n\nThis reverts commit 7608e136bd495fe734ad18a6897dd4425e1a633b.\n\n(in prep for merge of 1.8.8 which includes this)\n\nTest: N/A, does not build\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I370d68c1caa8dcfb5d5934ee6e6324e8e2e519c2\n" }, { "commit": "6b1a394b2280d233d8e96c8e92deb1c5125b1ad2", "tree": "0d0c9c799652d91a77533dfbeea18522d248ea6b", "parents": [ "0d290e451f94c80c0b11ed43c6f478dccea30047" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:08:16 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat Oct 21 16:39:33 2023 -0700" }, "message": "iptables: reenable \u0027pointer-bool-conversion\u0027 warning\n\n(this does not seem to be needed any more)\n\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: I38949223393736d97623359b253fdfa1bcf222a2\n" }, { "commit": "4f02a8a3ee1ff8c0ce5e8014898f4f8209e41689", "tree": "6a0462f21ec5580d3a169986679a5e3d25a352af", "parents": [ "0e1118a30b3142c81e994c6937ca9e63b248716c", "e99c72d752638b55c64a38706446b1d2744b3342" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Fri Oct 20 11:58:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 20 11:58:45 2023 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/main\u0027 into HEAD am: e99c72d752\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/25104432\n\nChange-Id: Id1f829151419a964586f6c51393c66f40ba9f095\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0e1118a30b3142c81e994c6937ca9e63b248716c", "tree": "6a0462f21ec5580d3a169986679a5e3d25a352af", "parents": [ "cfd0e4b27be5ee140bf8dba24608b67de9d218fd", "9ea287214d390b9eff82ab2133ea9feb9ea16106" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 18 17:47:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 18 17:47:30 2023 +0000" }, "message": "[automerger skipped] Merge \"[NFC] Move MTE mode settings to a product variable.\" into udc-mainline-prod am: 9ea287214d -s ours\n\nam skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 4c2e8e9be2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/25093625\n\nChange-Id: Ifbf53096f249a1b43fead93766ac4961bc3968c2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cfd0e4b27be5ee140bf8dba24608b67de9d218fd", "tree": "6a0462f21ec5580d3a169986679a5e3d25a352af", "parents": [ "77c6b7a74bdd57521427774a41743159be3c4789", "13c56d5ec5ad9b5200dbee00ba33e362f81a82a8" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Wed Oct 18 17:47:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 18 17:47:26 2023 +0000" }, "message": "[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: 13c56d5ec5 -s ours\n\nam skip reason: Merged-In Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb with SHA-1 4c2e8e9be2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/25093625\n\nChange-Id: I34273f65e516bad599640c13e9ae56c6cf8357d7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "77c6b7a74bdd57521427774a41743159be3c4789", "tree": "6a0462f21ec5580d3a169986679a5e3d25a352af", "parents": [ "ab407a125352b2778a341bf4f1623bb9c4a9d696", "502bc8d3a450a798a393b15ef87b948fe04cd86b" ], "author": { "name": "Sam Saccone", "email": "samccone@google.com", "time": "Wed Oct 18 17:46:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 18 17:46:26 2023 +0000" }, "message": "[automerger skipped] Move OWNER reference master\u003d\u003emain. am: 502bc8d3a4 -s ours\n\nam skip reason: Merged-In I4d58bfd9933a0f6acba3f7e0204337609c6d3681 with SHA-1 4e328455b6 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/iptables/+/25093786\n\nChange-Id: Icca820039bf4bfe41b53cbc3642122af21c92d3a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e99c72d752638b55c64a38706446b1d2744b3342", "tree": "6a0462f21ec5580d3a169986679a5e3d25a352af", "parents": [ "9ea287214d390b9eff82ab2133ea9feb9ea16106", "0d290e451f94c80c0b11ed43c6f478dccea30047" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Oct 18 10:12:20 2023 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Oct 18 17:23:01 2023 +0000" }, "message": "Merge remote-tracking branch \u0027aosp/main\u0027 into HEAD\n\n* aosp/main:\n Move OWNER reference master\u003d\u003emain.\n [NFC] Move MTE mode settings to a product variable.\n\nIgnore-AOSP-First: this is a merge from AOSP\nBug: 305814576\nTest: TreeHugger\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nChange-Id: Ibc7cf9439e29f98d83f6e9207de8e34e02044578\n" }, { "commit": "9ea287214d390b9eff82ab2133ea9feb9ea16106", "tree": "6a0462f21ec5580d3a169986679a5e3d25a352af", "parents": [ "502bc8d3a450a798a393b15ef87b948fe04cd86b", "13c56d5ec5ad9b5200dbee00ba33e362f81a82a8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 18 16:54:42 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 18 16:54:42 2023 +0000" }, "message": "Merge \"[NFC] Move MTE mode settings to a product variable.\" into udc-mainline-prod" }, { "commit": "13c56d5ec5ad9b5200dbee00ba33e362f81a82a8", "tree": "3364ac8d8b9f627708be0cc148dad3fb01692505", "parents": [ "d5cc7e9c6a5e7781d16a1b8eb0d7c63cd8839d00" ], "author": { "name": "Evgenii Stepanov", "email": "eugenis@google.com", "time": "Wed Jun 07 15:06:59 2023 -0700" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue Oct 17 19:14:53 2023 +0000" }, "message": "[NFC] Move MTE mode settings to a product variable.\n\nThe default list of memtag targets found in\n build/make/target/product/memtag-common.mk\n\nBug: 280343521\nTest: no functional change\n(cherry picked from https://android-review.googlesource.com/q/commit:14c4d0944534c318fb92c6ec08c794ff6bec3392)\nMerged-In: Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb\nChange-Id: Ia894b5c70dd846d1a34a7e9ada4dc1442d5f53fb\n" }, { "commit": "502bc8d3a450a798a393b15ef87b948fe04cd86b", "tree": "0788f6d38328851c0580021944293560891303fc", "parents": [ "d5cc7e9c6a5e7781d16a1b8eb0d7c63cd8839d00" ], "author": { "name": "Sam Saccone", "email": "samccone@google.com", "time": "Tue Jul 18 18:01:02 2023 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue Oct 17 19:08:33 2023 +0000" }, "message": "Move OWNER reference master\u003d\u003emain.\n\nBUG\u003db/291759353\n(cherry picked from https://android-review.googlesource.com/q/commit:4e328455b68db7ae6fa0edc44e8e58ce98f1c84b)\nMerged-In: I4d58bfd9933a0f6acba3f7e0204337609c6d3681\nChange-Id: I4d58bfd9933a0f6acba3f7e0204337609c6d3681\n" }, { "commit": "920ece2b392fb83bd26416e0e6f8f6a847aacbaa", "tree": "1bd235383c2e0c6f157734c6aa96cf0334ca0f7e", "parents": [ "e2d7ee9c49b582f399ad4ba2da2ee1b3e1f89620" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Oct 12 17:54:53 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Oct 12 18:07:28 2023 +0200" }, "message": "extensions: string: Clarify description of --to\n\nString match indeed returns a match as long as the given pattern starts\nin the range of --from and --to, update the text accordingly.\nAlso add a note regarding fragment boundaries.\n\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1707\n" }, { "commit": "e2d7ee9c49b582f399ad4ba2da2ee1b3e1f89620", "tree": "255304667f7f27c3374210d3bd5ff295165fe564", "parents": [ "8ae55c2a331e932c0aeef8c6c138bf60deb9fd42" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Oct 12 17:27:42 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Oct 12 17:47:13 2023 +0200" }, "message": "libiptc: Fix for another segfault due to chain index NULL pointer\n\nChain rename code missed to adjust the num_chains value which is used to\ncalculate the number of chain index buckets to allocate during an index\nrebuild. So with the right number of chains present, the last chain in a\nmiddle bucket being renamed (and ending up in another bucket) triggers\nan index rebuild based on false data. The resulting NULL pointer index\nbucket then causes a segfault upon reinsertion.\n\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1713\nFixes: 64ff47cde38e4 (\"libiptc: fix chain rename bug in libiptc\")\n" }, { "commit": "8ae55c2a331e932c0aeef8c6c138bf60deb9fd42", "tree": "663511fab8a3c9f88bb2176ff96a1ad479571f6e", "parents": [ "54526ee6ecb8bf775557a5afe1b42520ae5f3817" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Oct 10 11:20:12 2023 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Oct 10 11:20:21 2023 +0200" }, "message": "configure: Bump version for 1.8.10 release\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "54526ee6ecb8bf775557a5afe1b42520ae5f3817", "tree": "a7225b7324d7fc31e7f3688cffc5162c546f6666", "parents": [ "cb884bf73a4d8585a7739702ca690fdc590341ba" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Sep 30 01:35:48 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Sep 30 01:39:34 2023 +0200" }, "message": "build: Bump dependency on libnftnl\n\nRecently added support for broute table emulation requires libnftnl\nversion 1.2.6.\n\nFixes: 73611d5582e72 (\"ebtables-nft: add broute table emulation\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "cb884bf73a4d8585a7739702ca690fdc590341ba", "tree": "d51c1089aede430bf6ba1651e0007579fe24bdd0", "parents": [ "52ed0ac516db9f3a44f61dfd8b65d20631bfa95b" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Sep 06 19:02:52 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Sep 14 12:20:11 2023 +0200" }, "message": "include: linux: Update kernel.h\n\nIts contents were moved into const.h and sysinfo.h, apply these changes\nto the cached copies. Fixes for the following warning when compiling\nxtables-monitor.c with new kernel headers in /usr/include:\n\n| In file included from ../include/linux/netfilter/x_tables.h:3,\n| from ../include/xtables.h:19,\n| from xtables-monitor.c:36:\n| ../include/linux/kernel.h:7: warning: \"__ALIGN_KERNEL\" redefined\n| 7 | #define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)\n| |\n| In file included from /usr/include/linux/netlink.h:5,\n| from /home/n0-1/git/libmnl/install/include/libmnl/libmnl.h:9,\n| from xtables-monitor.c:30:\n| /usr/include/linux/const.h:31: note: this is the location of the previous definition\n| 31 | #define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)\n| |\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "52ed0ac516db9f3a44f61dfd8b65d20631bfa95b", "tree": "0e04e0726ae98f0ac68d6801737149fabb7decb3", "parents": [ "ea12b1d2b191f100a6fdb83af4681364e4dba12a" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Sep 06 16:32:47 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Sep 14 12:20:11 2023 +0200" }, "message": "nft: Fix for useless meta expressions in rule\n\nA relict of legacy iptables\u0027 mandatory matching on interfaces and IP\naddresses is support for the \u0027-i +\u0027 notation, basically a \"match any\ninput interface\". Trying to make things better than its predecessor,\niptables-nft boldly optimizes that nop away - not entirely though, the\nmeta expression loading the interface name was left in place. While not\na problem (apart from pointless overhead) in current HEAD, v1.8.7 would\ntrip over this as a following cmp expression (for another match) was\nincorrectly linked to that stale meta expression, loading strange values\ninto the respective interface name field.\n\nWhile being at it, merge and generalize the functions into a common one\nfor use with ebtables\u0027 NFT_META_BRI_(I|O)IFNAME matches, too.\n\nFixes: 0a8635183edd0 (\"xtables-compat: ignore \u0027+\u0027 interface name\")\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1702\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "ea12b1d2b191f100a6fdb83af4681364e4dba12a", "tree": "89b21b7fce1121111aa331cc422ef1570d0cf12d", "parents": [ "2e704f6ddd6d056e360f3d9c11e8b6c56a20cf23" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri Sep 01 13:16:56 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Sep 14 12:20:11 2023 +0200" }, "message": "tests: shell: Fix for ineffective 0007-mid-restore-flush_0\n\nThe test did not catch non-zero exit status of the spawned coprocess. To\nmake it happen, Drop the line killing it (it will exit anyway) and pass\nits PID to \u0027wait\u0027.\n\nWhile being at it, put the sleep into the correct spot (otherwise the\ncheck for chain \u0027foo\u0027 existence fails as it runs too early) and make\nsaid chain existence check effective.\n\nFixes: 4e3c11a6f5a94 (\"nft: Fix for ruleset flush while restoring\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "2e704f6ddd6d056e360f3d9c11e8b6c56a20cf23", "tree": "0c703ad982fdf243878738005ccae75f4d4039c6", "parents": [ "35ff97e9aca8cd301ff9b9a95b0a72de1aeb700b" ], "author": { "name": "Quentin Armitage", "email": "quentin@armitage.org.uk", "time": "Sat Nov 23 08:41:58 2013 +0000" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Sep 14 12:20:11 2023 +0200" }, "message": "extensions: Fix checking of conntrack --ctproto 0\n\nThere are three issues in the code:\n1) the check (sinfo-\u003einvflags \u0026 XT_INV_PROTO) is using the wrong mask\n2) in conntrack_mt_parse it is testing (info-\u003einvert_flags \u0026\n XT_INV_PROTO) before the invert bit has been set.\n3) the sense of the error message is the wrong way round\n\n1) To get the error, ! -ctstatus XXX has to be specified, since\n XT_INV_PROTO \u003d\u003d XT_CONNTRACK_STATUS e.g.\n | iptables -I CHAIN -m conntrack ! --ctstatus ASSURED --ctproto 0 ...\n\n3) Unlike --proto 0 (where 0 means all protocols), in the conntrack\n match --ctproto 0 appears to mean protocol 0, which can never be.\n Therefore --ctproto 0 could never match and ! --ctproto 0 will always\n match. Both of these should be rejected, since the user clearly\n cannot be intending what was specified.\n\nThe attached patch resolves the issue, and also produces an error\nmessage if --ctproto 0 is specified (as well as ! --ctproto 0 ), since\n--ctproto 0 will never match, and ! --ctproto 0 will always match.\n\n[Phil: - Added Fixes: tag - it\u0027s a day 1 bug\n - Copied patch description from Bugzilla\n - Reorganized changes to reduce diff\n - Added test cases]\n\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d874\nFixes: 5054e85be3068 (\"general conntrack match module userspace support files\")\nSigned-off-by: Quentin Armitage \u003cquentin@armitage.org.uk\u003e\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "35ff97e9aca8cd301ff9b9a95b0a72de1aeb700b", "tree": "5f4b36dfccf29e4290e48b3a7dfe6bc7dab5dbf2", "parents": [ "63e4a64e943be64a7e0486838071b981074e696d" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Tue Aug 15 13:47:28 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri Sep 01 13:15:03 2023 +0200" }, "message": "Revert --compat option related commits\n\nThis reverts the following commits:\n\nb14c971db6db0 (\"tests: Test compat mode\")\n11c464ed015b5 (\"Add --compat option to *tables-nft and *-nft-restore commands\")\nca709b5784c98 (\"nft: Introduce and use bool nft_handle::compat\")\n402b9b3c07c81 (\"nft: Pass nft_handle to add_{target,action}()\")\n\nThis implementation of a compatibility mode implements rules using\nxtables extensions if possible and thus relies upon existence of those\nin kernel space. Assuming no viable replacement for the internal\nmechanics of this mode will be found in foreseeable future, it will\neffectively block attempts at deprecating and removing of these xtables\nextensions in favor of nftables expressions and thus hinder upstream\u0027s\nfuture plans for iptables.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "63e4a64e943be64a7e0486838071b981074e696d", "tree": "25cbbcb52188f503d7d784ca45430143eb9c8ba8", "parents": [ "b14c971db6db069fbfd2a892c617de8d8bf26733" ], "author": { "name": "Victor Julien", "email": "victor@inliniac.net", "time": "Tue Aug 29 14:59:32 2023 +0200" }, "committer": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Tue Aug 29 16:32:05 2023 +0200" }, "message": "doc: fix example of xt_cpu\n\nREDIRECT uses --to-ports instead of --to-port.\n\nFixes: 2d59208943a3 (\"extension: add xt_cpu match\")\n\nSigned-off-by: Victor Julien \u003cvictor@inliniac.net\u003e\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\n" }, { "commit": "b14c971db6db069fbfd2a892c617de8d8bf26733", "tree": "7943aa0771f1900cbaff4a3725a8f2f6c2e45e8c", "parents": [ "11c464ed015b52a28d90c63c69e10e5f7d4053d4" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri May 05 20:18:38 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri Aug 11 15:56:38 2023 +0200" }, "message": "tests: Test compat mode\n\nExtend iptables-test.py by a third mode, which is using\nxtables-nft-multi and passing --compat to all calls creating rules.\n\nAlso add a shell testcase asserting the effectiveness of --compat by\ncomparing debug (-vv) output.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "11c464ed015b52a28d90c63c69e10e5f7d4053d4", "tree": "5c2d3bd5a627720284e609dd966ff94246847ac8", "parents": [ "ca709b5784c982de12d6eab361cfc9c900aec4c7" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri May 05 20:04:41 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri Aug 11 15:56:38 2023 +0200" }, "message": "Add --compat option to *tables-nft and *-nft-restore commands\n\nThe flag sets nft_handle::compat boolean, indicating a compatible rule\nimplementation is wanted. Users expecting their created rules to be\nfetched from kernel by an older version of *tables-nft may use this to\navoid potential compatibility issues.\n\nChanges since v1:\n- Expect short option \u0027-C\u0027 in {ip,ip6,eb}tables-nft-restore command line\n parser\n- Support -C/--compat in arptables-nft-restore, too\n- Update man pages with the new flag\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "ca709b5784c982de12d6eab361cfc9c900aec4c7", "tree": "f9050ead4c83cffa9f933cb988ad1cba330d5163", "parents": [ "402b9b3c07c8192be3bfc0191fbf56401e26a003" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri May 05 17:39:08 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri Aug 11 15:56:38 2023 +0200" }, "message": "nft: Introduce and use bool nft_handle::compat\n\nIf set, create rules using compat expressions where possible and disable\nthe bitwise expression avoidance introduced in 323259001d617 (\"nft:\nOptimize class-based IP prefix matches\").\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "402b9b3c07c8192be3bfc0191fbf56401e26a003", "tree": "e9ad98d8b47a739f314931e82436b05248ed192d", "parents": [ "2d6221641d66b502b1a49d3267bd8126b0448a1d" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri May 05 16:01:29 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Fri Aug 11 15:56:38 2023 +0200" }, "message": "nft: Pass nft_handle to add_{target,action}()\n\nPrepare for varying rule content based on a global flag.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "2d6221641d66b502b1a49d3267bd8126b0448a1d", "tree": "19bb7a57750581945536e3b48f0c66d94c2c2d00", "parents": [ "99cd1282779beecf337c4587ffc133ecafb8130f" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Tue Aug 08 16:33:44 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 14:14:55 2023 +0200" }, "message": "Use SOCK_CLOEXEC/O_CLOEXEC where available\n\nNo need for the explicit fcntl() call, request the behaviour when\nopening the descriptor.\n\nOne fcntl() call setting FD_CLOEXEC remains in extensions/libxt_bpf.c,\nthe indirect syscall seems not to support passing the flag directly.\n\nReported-by: Gaurav Gupta \u003cg.gupta@samsung.com\u003e\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1104\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "99cd1282779beecf337c4587ffc133ecafb8130f", "tree": "2e20ca72adcf775660d643ddbe573879a13d08ca", "parents": [ "43f78733059ecd28d8567d8205cab5ed62d93458" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 12:51:13 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 14:14:46 2023 +0200" }, "message": "tests: shell: Test chain policy counter behaviour\n\nTest the last two fixes in that area.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "43f78733059ecd28d8567d8205cab5ed62d93458", "tree": "89b520a7b8cf2abaf73597839bf9d0c23656609c", "parents": [ "39a067bb3b1b4ffb50a925f66e7db56658c0dfa7" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 03 17:59:03 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 14:14:39 2023 +0200" }, "message": "Revert \"libiptc: fix wrong maptype of base chain counters on restore\"\n\nThis reverts commit 7c4d668c9c2ee007c82063b7fc784cbbf46b2ec4.\n\nThe change can\u0027t be right: A simple rule append call will reset all\nbuilt-in chains\u0027 counters. The old code works fine even given the\nmentioned \"empty restore\" use-case, at least if counters don\u0027t change on\nthe fly in-kernel.\n\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d912\nFixes: 7c4d668c9c2ee (\"libiptc: fix wrong maptype of base chain counters on restore\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "39a067bb3b1b4ffb50a925f66e7db56658c0dfa7", "tree": "528bfdcafa0d92ad0ce601a0018aa94c6f078fee", "parents": [ "5412ccba55b2318160d32efec3b8aad162608af9" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 11:30:59 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 14:14:25 2023 +0200" }, "message": "nft: Create builtin chains with counters enabled\n\nThe kernel enables policy counters for nftables chains only if\nNFTA_CHAIN_COUNTERS attribute is present. For this to be generated, one\nhas to set NFTNL_CHAIN_PACKETS and NFTNL_CHAIN_BYTES attributes in the\nallocated nftnl_chain object.\n\nThe above happened for base chains only with iptables-nft-restore if\ncalled with --counters flag. Since this is very unintuitive to users,\nfix the situation by adding counters to base chains in any case.\n\nFixes: 384958620abab (\"use nf_tables and nf_tables compatibility interface\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "5412ccba55b2318160d32efec3b8aad162608af9", "tree": "b6e8a04ee30c4186820bcd4ff3ea4eae215cd094", "parents": [ "7304f1982d619e19860106bc74b9cf3d05ddb113" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Jul 26 19:43:20 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 14:11:42 2023 +0200" }, "message": "tests: iptables-test: Fix command segfault reports\n\nLogging produced a stack trace due to undefined variable \u0027cmd\u0027.\n\nFixes: 0e80cfea3762b (\"tests: iptables-test: Implement fast test mode\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "7304f1982d619e19860106bc74b9cf3d05ddb113", "tree": "346e49793170f200cfeb5d494292b09eb17f6e31", "parents": [ "2a6eee89083c837ac429b0e5aba33bdcaeb51a57" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Thu Aug 03 21:39:13 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 13:44:12 2023 +0200" }, "message": "nft-ruleparse: parse meta mark set as MARK target\n\nMixing nftables and iptables-nft in the same table doesn\u0027t work,\nbut some people do this.\n\nv1.8.8 ignored rules it could not represent in iptables syntax,\nv1.8.9 bails in this case.\n\nAdd parsing of meta mark expressions so iptables-nft can render them\nas -j MARK rules.\n\nThis is flawed, nft has features that have no corresponding\nsyntax in iptables, but we can\u0027t undo this.\n\nLink: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1659\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "2a6eee89083c837ac429b0e5aba33bdcaeb51a57", "tree": "58d444fd7ec52e20f8da9f1506e573c323f78785", "parents": [ "bb7d5fde80ccb4672dcf9644b4ccf1bffc0919fd" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Tue Jan 31 19:55:57 2023 +0100" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Thu Aug 10 13:44:12 2023 +0200" }, "message": "nft-ruleparse: Introduce nft_create_target()\n\nLike nft_create_match(), this is a small wrapper around the typical\ntarget extension lookup and (standard) init code.\n\nTo use it from nft_parse_target() and nft_parse_log(), introduce an\ninner variant which accepts the target payload size as parameter.\n\nThe call to rule_parse_ops::target callback was problematic with\nstandard target, because the callbacks initialized\niptables_command_state::jumpto with the target name, \"standard\" in that\ncase. Perform its tasks in nft_create_target(), keep it only for bridge\nfamily\u0027s special handling of watcher \"targets\".\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "bb7d5fde80ccb4672dcf9644b4ccf1bffc0919fd", "tree": "b8f35bc9101c811b4e5cd994d421d6ac72acf0ac", "parents": [ "d5c869add2501aa722682c825b7b9ee247d22ec8" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 11:31:56 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:30:26 2023 +0200" }, "message": "extensions: libip6t_icmp: Add names for mld-listener types\n\nAdd the three names (plus one alias) just as in nftables.\n\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1250\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "d5c869add2501aa722682c825b7b9ee247d22ec8", "tree": "38d75e614b8e8d86a02e9896c5e872fa449e20f6", "parents": [ "952186aa0342f6bf3c4614a609525338d057d8d9" ], "author": { "name": "Jan Palus", "email": "atler@pld-linux.org", "time": "Mon Dec 28 10:59:42 2020 +0100" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:30:05 2023 +0200" }, "message": "nft: move processing logic out of asserts\n\n[Phil: Introduce assert_nft_restart() to keep things clean, also add\n fallback returns to nft_action() and nft_prepare(), sanitizing\n things at least a bit.]\n\nCloses: https://bugzilla.netfilter.org/show_bug.cgi?id\u003d1487\nSigned-off-by: Jan Palus \u003catler@pld-linux.org\u003e\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "952186aa0342f6bf3c4614a609525338d057d8d9", "tree": "764feb6c7b4294276c43fe5de0d147ef558cbb8d", "parents": [ "f1fd95ccefe483f0e3f2da593c6d4b671a7de522" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 02:06:00 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:58 2023 +0200" }, "message": "man: iptables-save.8: Start paragraphs in upper-case\n\nAlso add a missing full stop.\n\nFixes: 117341ada43dd (\"Added iptbles-restore and iptables-save manpages\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "f1fd95ccefe483f0e3f2da593c6d4b671a7de522", "tree": "b17d6d4050c929db6c787c4db5317efa0e23a18b", "parents": [ "9458313e017eaa0f8daccff57df24da01f5b6fb8" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 02:01:59 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:54 2023 +0200" }, "message": "man: iptables-save.8: Fix --modprobe description\n\n- Consistently use \u0027modprobe\u0027 as option argument name\n- Add a reference to modprobe man page\n- Put the path in italics and the command in bold\n\nFixes: fbb5639c02218 (\"iptables-save: module loading corrections\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "9458313e017eaa0f8daccff57df24da01f5b6fb8", "tree": "be550767beea0d085c62bd4bcab3822d3b3ef800", "parents": [ "b0092a80656da7cf66f15ce906b17ab040ece12f" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:55:08 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:49 2023 +0200" }, "message": "man: iptables-save.8: Clarify \u0027available tables\u0027\n\nThis appears to be confusing. Since a missing table is also not flushed\n(\"restored\") when feeding the dump into iptables-restore, such a restore\ncall may be considered incomplete.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "b0092a80656da7cf66f15ce906b17ab040ece12f", "tree": "2898efadb0f94eac2e78c3d44d2720c07c146c12", "parents": [ "935a5cf8afa96daa1c688efd59b9025e3a78fba4" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:48:14 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:36 2023 +0200" }, "message": "man: Trivial: Missing space after comma\n\nFixes: 6a79d78986c02 (\"iptables: mention iptables-apply(8) in manpages\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "935a5cf8afa96daa1c688efd59b9025e3a78fba4", "tree": "d6f3abc12a859838b02b3a4e1ffdcac9cb41847d", "parents": [ "b200f0870bc17046d6db64a1a65937ad5f263633" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:40:17 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:34 2023 +0200" }, "message": "man: iptables-restore.8: Start paragraphs in upper-case\n\nAlso add a missing full stop in one spot.\n\nFixes: 117341ada43dd (\"Added iptbles-restore and iptables-save manpages\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "b200f0870bc17046d6db64a1a65937ad5f263633", "tree": "6e0efa670701d64835ca0da4cf42b3be4c61d49e", "parents": [ "193107df55541ced2e783bcce9b71b97f88a5398" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:37:09 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:33 2023 +0200" }, "message": "man: iptables-restore.8: Put \u0027file\u0027 in italics in synopsis\n\nThe text has it this way already, be consistent.\n\nFixes: 081d57839e91e (\"iptables-restore.8: file to read from can be specified as argument\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "193107df55541ced2e783bcce9b71b97f88a5398", "tree": "807602a4afc827d477a404b90cc77d542517bf5c", "parents": [ "e7bc6cc8aca993b743e83f20b2f579aed2f5d954" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:34:51 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:31 2023 +0200" }, "message": "man: iptables-restore.8: Drop -W option from synopsis\n\nThe description was dropped already, there is no benefit in still\nlisting it.\n\nFixes: 07e2107ef0cbc (\"xshared: Implement xtables lock timeout using signals\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "e7bc6cc8aca993b743e83f20b2f579aed2f5d954", "tree": "3533483cae4c219cb15d968e23eae90b5bbf2d77", "parents": [ "0f05f523ac02843ab7bbd09a96ba3fa384ae9523" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:33:26 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:29 2023 +0200" }, "message": "man: iptables-restore.8: Consistently document -w option\n\nUse the same name for the option\u0027s argument.\n\nFixes: 65801d02a482b (\"iptables-restore.8: document -w/-W options\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "0f05f523ac02843ab7bbd09a96ba3fa384ae9523", "tree": "8a6f5be00289e7ce7ab6b6aff2d9f369691676b6", "parents": [ "beaed986f772dfd31cbfc58daadc97b886a786b2" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 01:27:11 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:24 2023 +0200" }, "message": "man: iptables-restore.8: Fix --modprobe description\n\n- Consistently use \u0027modprobe\u0027 as option argument name\n- Add a reference to modprobe man page\n- Put the path in italics, and the command in bold\n\nFixes: 8c46901ff5785 (\"doc: document iptables-restore\u0027s -M option\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "beaed986f772dfd31cbfc58daadc97b886a786b2", "tree": "546b4b1dd7d7d657338d913364014230dc2e853a", "parents": [ "a41ec065ebad9b38ebf2a193aeb42f59a7e30214" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 00:49:03 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:19 2023 +0200" }, "message": "man: iptables.8: Trivial font fixes\n\nNo content changes intended, just type commands in bold and the single\npath reference in italics.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "a41ec065ebad9b38ebf2a193aeb42f59a7e30214", "tree": "6673270ac376b9f985b1f6a831c5d117a2f6bce5", "parents": [ "94c19939744dbbbc6ff0fedf6cdba661769fdc87" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 00:41:38 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:03 2023 +0200" }, "message": "man: Use HTTPS for links to netfilter.org\n\nThe browser is redirected there anyway, but who cares about such minor\ndetails nowadays.\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "94c19939744dbbbc6ff0fedf6cdba661769fdc87", "tree": "7643740a8a3f3a58d05abbc538ece49a5111d3a8", "parents": [ "3bda308b32847d08b2c27077fa3c02200b59cdca" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 00:28:03 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:29:01 2023 +0200" }, "message": "man: iptables.8: Clarify --goto description\n\nText speaks about behaviour of RETURN target when used in chains\nredirected to using --goto instead of --jump, not the difference between\n--jump option and \"return\".\n\nFixes: 17fc163babc34 (\"add \u0027goto\u0027 support (Henrik Nordstrom \u003chno@marasystems.com\u003e)\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "3bda308b32847d08b2c27077fa3c02200b59cdca", "tree": "eec48aaf1fbc601bb4eb6853d781d6080d321f30", "parents": [ "fae244f731b0198ec0194903e7e82944efd9bfa3" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 00:23:37 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:28:58 2023 +0200" }, "message": "man: iptables.8: Fix intra page reference\n\nWhen sections MATCH EXTENSIONS and TARGET EXTENSIONS were combined, the\nreference could have been updated to specify the exact title.\n\nFixes: 4496801821c01 (\"doc: deduplicate extension descriptions into a new manpage\")\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" }, { "commit": "fae244f731b0198ec0194903e7e82944efd9bfa3", "tree": "61eae9c3c7194b1993a051d963305f26755cd76d", "parents": [ "13c9efa80e50bdf9187b5f5a16b34eda49425fd3" ], "author": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Wed Aug 02 00:05:45 2023 +0200" }, "committer": { "name": "Phil Sutter", "email": "phil@nwl.cc", "time": "Sat Aug 05 01:28:52 2023 +0200" }, "message": "man: iptables.8: Trivial spelling fixes\n\n- Missing \"and\" as well as full stop\n- Missing comma in enumeration\n- Duplicate \"previous\"\n- Confusions are avoided rather than simplified\n- Missing space after comma\n\nSigned-off-by: Phil Sutter \u003cphil@nwl.cc\u003e\n" } ], "next": "13c9efa80e50bdf9187b5f5a16b34eda49425fd3" }