Skip to content

Commit 631f361

Browse files
authored
Merge pull request #273 from AkihiroSuda/dev
parson: update to v1.1.3 + release slirp4netns v1.1.12
2 parents df67b2f + 7a71438 commit 631f361

File tree

7 files changed

+159
-49
lines changed

7 files changed

+159
-49
lines changed

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.69])
2-
AC_INIT([slirp4netns], [1.1.11+dev], [https://github.com/rootless-containers/slirp4netns/issues])
2+
AC_INIT([slirp4netns], [1.1.12+dev], [https://github.com/rootless-containers/slirp4netns/issues])
33
AC_CONFIG_SRCDIR([main.c])
44
AC_CONFIG_HEADERS([config.h])
55

vendor.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
set -eux -o pipefail
33

4-
# Feb 21, 2020
5-
PARSON_COMMIT=70dc239f8f54c80bf58477b25435fd3dd3102804
4+
# v1.1.3 (May 26, 2021)
5+
PARSON_COMMIT=2d7b3ddf1280bf7f5ad82d26e09252240e7c4557
66
PARSON_REPO=https://github.com/kgabis/parson.git
77

88
# prepare

vendor/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# DO NOT EDIT MANUALLY
22

33
Vendored components:
4-
* parson: https://github.com/kgabis/parson.git (`70dc239f8f54c80bf58477b25435fd3dd3102804`)
4+
* parson: https://github.com/kgabis/parson.git (`2d7b3ddf1280bf7f5ad82d26e09252240e7c4557`)
55

66
Please do not edit the contents under this directory manually.
77

vendor/parson/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2012 - 2019 Krzysztof Gabis
3+
Copyright (c) 2012 - 2021 Krzysztof Gabis
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

vendor/parson/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## About
2-
Parson is a lighweight [json](http://json.org) library written in C.
2+
Parson is a lightweight [json](http://json.org) library written in C.
33

44
## Features
55
* Full JSON support
@@ -142,6 +142,7 @@ I will always merge *working* bug fixes. However, if you want to add something n
142142
Remember to follow parson's code style and write appropriate tests.
143143
144144
## My other projects
145+
* [ape](https://github.com/kgabis/ape) - simple programming language implemented in C library
145146
* [kgflags](https://github.com/kgabis/kgflags) - easy to use command-line flag parsing library
146147
* [agnes](https://github.com/kgabis/agnes) - header-only NES emulation library
147148

0 commit comments

Comments
 (0)