Skip to content

Commit

Permalink
Merge pull request #273 from AkihiroSuda/dev
Browse files Browse the repository at this point in the history
parson: update to v1.1.3 + release slirp4netns v1.1.12
  • Loading branch information
AkihiroSuda authored Aug 3, 2021
2 parents df67b2f + 7a71438 commit 631f361
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 49 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
AC_INIT([slirp4netns], [1.1.11+dev], [https://github.com/rootless-containers/slirp4netns/issues])
AC_INIT([slirp4netns], [1.1.12+dev], [https://github.com/rootless-containers/slirp4netns/issues])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_HEADERS([config.h])

Expand Down
4 changes: 2 additions & 2 deletions vendor.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -eux -o pipefail

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

# prepare
Expand Down
2 changes: 1 addition & 1 deletion vendor/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DO NOT EDIT MANUALLY

Vendored components:
* parson: https://github.com/kgabis/parson.git (`70dc239f8f54c80bf58477b25435fd3dd3102804`)
* parson: https://github.com/kgabis/parson.git (`2d7b3ddf1280bf7f5ad82d26e09252240e7c4557`)

Please do not edit the contents under this directory manually.

Expand Down
2 changes: 1 addition & 1 deletion vendor/parson/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2012 - 2019 Krzysztof Gabis
Copyright (c) 2012 - 2021 Krzysztof Gabis

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 2 additions & 1 deletion vendor/parson/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## About
Parson is a lighweight [json](http://json.org) library written in C.
Parson is a lightweight [json](http://json.org) library written in C.

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

0 comments on commit 631f361

Please sign in to comment.