Skip to content

Commit 832ee3e

Browse files
committed
Fix gitignore line for *.iml files
1 parent 3fc7d80 commit 832ee3e

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.last-exported-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Last exported commit from parent repo: d6e5804d6fcba05fe0af882a0c1db8ffb0050320
1+
Last exported commit from parent repo: 9737839d92e3d170e213434fec8533a7f1375ea3

nix-bootstrap.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 2.0
55
-- see: https://github.com/sol/hpack
66

77
name: nix-bootstrap
8-
version: 1.5.4.3
8+
version: 1.5.5.0
99
author: gchquser
1010
maintainer: [email protected]
1111
copyright: Crown Copyright

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
name: nix-bootstrap
15-
version: 1.5.4.3
15+
version: 1.5.5.0
1616
author: gchquser
1717
maintainer: [email protected]
1818
copyright: Crown Copyright

src/Bootstrap/Data/Bootstrappable/Gitignore.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ ggJavaIDEFiles =
149149
".project",
150150
".classpath",
151151
".idea/",
152-
".iml"
152+
"*.iml"
153153
]
154154

155155
ggJavaMobileTools :: GitignoreGroup

vulnerability-whitelist.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ comment = "CVEs refer to RedHat Fuse, not C libfuse (Filesystem in Userspace) on
5454
comment = "gcc is only a build-time dependency so we are not vulnerable to this attack."
5555

5656
["glibc"]
57-
cve = ["CVE-2023-4527", "CVE-2023-4813", "CVE-2023-5156", "CVE-2023-0687", "CVE-2023-6779"]
58-
comment = "Crashes accepted as not a critical system. Stack contents of nix-bootstrap should never be sensitive."
57+
cve = ["CVE-2023-4527", "CVE-2023-4813", "CVE-2023-5156", "CVE-2023-0687", "CVE-2023-6779", "CVE-2023-4911"]
58+
comment = """Crashes accepted as not a critical system. Stack contents of nix-bootstrap should never be sensitive.
59+
60+
However, CVE-2023-4911 poses a genuine risk. The fix is not yet available in nixpkgs, but it should be applied once it is."""
61+
until = "2024-03-31"
5962

6063
["git"]
6164
comment = """Git is only a build-time dependency of the project; it is the responsibility of users \

0 commit comments

Comments
 (0)