mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-20 13:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
759 Commits 14 Branches 11 Tags
aadde421a52c1d433359bc529cf2ef06d1dce430
Commit Graph

70 Commits

Author SHA1 Message Date
Eric Haszlakiewicz
914527d091 Eliminate ACLOCAL_AMFLAGS, since it changes how libtool files are generated too significantly. 2018-03-05 23:14:57 -05:00
Eric Haszlakiewicz
4d814600d7 Bump the major version of the .so library generated up to 4.0 to avoid conflicts because some downstream packagers of json-c had already done their own bump to ".so.3" for a much older 0.12 release. 2018-01-15 23:34:05 -05:00
Björn Esser
3e89278476 Makefile: Add ACLOCAL_AMFLAGS 
This is recommended by the libtool manual.
 2017-12-14 15:48:31 +01:00
Eric Haszlakiewicz
b484ff0b6d Merge d447fbc from master to json-c-0.13, to avoid installing private headers. 2017-12-07 18:25:40 -05:00
Eric Haszlakiewicz
d447fbca77 Don't include private headers when installing. 2017-12-07 18:24:08 -05:00
Eric Haszlakiewicz
1f3bc5f20c Bump the version up to 0.13 2017-12-07 18:03:29 -05:00
Eric Haszlakiewicz
b34d26ff25 Add a change log entry for the upcoming 0.13 release. 2017-12-02 22:13:22 -05:00
Brent Cook
185f43afef add/remove missing distribution files 2017-11-26 08:33:04 -06:00
Eric Haszlakiewicz
447d67d5f3 Issue #349: none of automake's clean targets are suite for really cleaning up everything, so add a local "really-clean" target that does so. 2017-08-30 23:17:24 -04:00
László Várady
e0e34f0a13 Fix 'make distcheck' 
Signed-off-by: László Várady <laszlo.varady@balabit.com>
 2017-08-04 12:31:11 +02:00
László Várady
db8dbbf371 Fix 'make dist' 
EXTRA_DIST copies the listed directories/files from the _source_ directory
into the distribution.

Since the doc directory does not exist after running autogen + configure
+ make dist, the distribution tarball generation fails.

Note that the dist-hook rule below operates on 'distdir', not on the source
directory where EXTRA_DIST expects the existence of the doc folder.

In summary, even if I removed 'doc' from EXTRA_DIST, the dist tarball will
always contain the documentation (due to the dist-hook rule).

Signed-off-by: László Várady <laszlo.varady@balabit.com>
 2017-08-04 12:31:06 +02:00
Eric Haszlakiewicz
fcad0ec015 PR #336: since we can't use function overriding (due to problems with it on 
OSX) always include the _json_c_strerror function but only enable it with a flag
 during tests.
 2017-07-15 07:12:44 -07:00
Alexandru Ardelean
fb72160caf build: make strerror() override-able 
If we want to override `strerror()` in libjson-c
to make tests consistent across platforms, we
need to do it build-wide as configure/build
option.

Apple linkers make it really hard to override functions
at link-time, and this seems to be locked down on travis-ci.org
[ for security reasons I assume ].
While I got it to work locally, it did not work
when running on travis.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
 2017-07-13 10:27:24 +03:00
Alexandru Ardelean
47f32a76ef vasprintf_compat.h: spin-off this compat header ; use math_compat.h as template 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
 2016-11-22 16:37:30 +02:00
Alexandru Ardelean
8cb86a583a strdup_compat.h: re-spin this compat header ; use math_compat.h as template 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
 2016-11-22 16:37:29 +02:00
Emmanuele Bassi
7601f20d70 Revert "compat/strdup.h: move common compat check for strdup() to own file" 
This reverts commit aaba8c1080.

This commit breaks builddir != srcdir build, but, more importantly, it
also adds a dependency on a header, "config.h", which is not installed
and it's supposed to be private — since it's generated at configuration
time and it's not meant to be used by projects compiling against a
library.
 2016-11-07 20:51:11 +00:00
Alexandru Ardelean
0e91183300 json_pointer: add first revision 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
 2016-11-04 09:51:36 +02:00
Alexandru Ardelean
aaba8c1080 compat/strdup.h: move common compat check for strdup() to own file 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
 2016-11-03 15:51:33 +02:00
Eric Haszlakiewicz
ecdc14f535 Add a json_c_visit() function to provide a way to iterate over a tree of json-c objects. 2016-10-29 15:01:20 -04:00
Nicola Spanti (RyDroid)
250a3987cf Very minor changes not related to C source code 2016-08-08 15:13:43 +02:00
Eric Haszlakiewicz
b1d65b62db Issue #113: Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail. 2016-06-27 04:30:04 +00:00
Eric Haszlakiewicz
1071385896 Issue #113: add "new" files to appropriate variables in Makefile, and note the need to run "make distcheck" as part of the release process. 
Fix issues with the test script so it works under distcheck too.
 2016-06-27 04:15:30 +00:00
Eric Haszlakiewicz
80c1f69b9e Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports. 2015-10-23 02:16:40 +00:00
Christopher Meng
db833f2411 SONAME bump 
The last json_tokener_errors change affects the binary package, we need a bump to solve the issue.

See [this bug of postgis.](https://bugzilla.redhat.com/show_bug.cgi?id=1123785)
 2014-07-28 19:28:19 +08:00
Michael Clark
64e36901a0 Patch to address the following issues: 
* CVE-2013-6371: hash collision denial of service
* CVE-2013-6370: buffer overflow if size_t is larger than int
 2014-04-09 13:48:21 +08:00
Eric Haszlakiewicz
b821f0e10f Merge branch 'ebassi-master' 2014-02-11 23:06:19 -05:00
Eric Haszlakiewicz
c8e0497d47 Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master 
Conflicts:
	Makefile.am
 2014-02-11 23:05:54 -05:00
Eric Haszlakiewicz
295bea21d0 Ignore and cleanup a few more files that automake creates. 2014-02-11 23:03:46 -05:00
Eric Haszlakiewicz
c8ee919642 Remove the old libjson.so name compatibility support. The library is only created as libjson-c.so now and headers are only installed into the ${prefix}/json-c directory. 2014-02-11 22:49:59 -05:00
Emmanuele Bassi
311686f63e Add a check for the -Bsymbolic-functions linker flag 
The -Bsymbolic-functions linker flag reduces the amount of PLT jumps in
a shared object, and has a side effect of preventing symbol collisions
in libraries and applications linking against two different shared
objects exposing the same symbol.

While the former is (generally) a performance win, the latter is less
rare than expected. For instance, PulseAudio started linking against
json-c a while ago; now, every project linking against PulseAudio is
leaking json-c symbols. In the GNOME platform, this means that projects
linking against PulseAudio cannot be safely linked against other
libraries depending on the GLib-based JSON parsing libraries JSON-GLib,
because of a symbol conflict. Nominally, this conflict would not be an
issue: libraries and applications do not need to depend on two different
JSON parsing libraries; the symbol leakage, though, ends up causing
either segmentation faults, or weird errors. For further reference,
please see: https://bugzilla.gnome.org/show_bug.cgi?id=703734

JSON-GLib already switched to using -Bsymbolic-functions, but it would
be safe if json-c did the same, wherever the linker flag is available.
 2013-09-17 13:08:14 +01:00
Eric Haszlakiewicz
be002fbb96 Issue#84: explicitly remove old headers and include/json directory so creating the compat symlink can work. 2013-06-29 15:21:04 -05:00
Eric Haszlakiewicz
fcc768e667 Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch. 2012-12-23 11:09:20 -06:00
Eric Haszlakiewicz
1461b49385 Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time. 2012-12-23 10:57:44 -06:00
Alexander Klauer
024d86c07f Prepend DESTDIR to paths for staged installs 2012-12-19 13:16:38 +01:00
Alexander Klauer
a3a0f5b28d Need to explicitly remove include/json-c directory 2012-12-18 18:45:39 +01:00
Alexander Klauer
b670f6f992 -d test is useless as symlinks are dereferenced 2012-12-18 18:44:52 +01:00
Eric Haszlakiewicz
7a4506d6df Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. 2012-12-09 15:46:35 -06:00
Eric Haszlakiewicz
23461c75dd Include json_object_iterator.c in the list of sources. 2012-11-29 13:23:06 -06:00
Eric Haszlakiewicz
2f2180b70d Take a guess as to the rename changes changes needed to the Android part of the build. 
I think this should work, but I can't test it.
 2012-07-29 18:29:38 -05:00
Eric Haszlakiewicz
1f9d199522 Re-add the "json" pkg-config file as a compatibility shim. 
Also rename the json-c-uninstalled.pc file.
 2012-07-29 18:25:09 -05:00
Eric Haszlakiewicz
9f16e25a3e Bump the version of the new library since programs will need to be re-linked to use it. 2012-07-29 18:05:34 -05:00
Eric Haszlakiewicz
943b7a4de7 Add a compatibility symlink json->json-c in the include directory. 2012-07-29 18:05:08 -05:00
Eric Haszlakiewicz
075b783631 Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so 2012-07-29 17:48:22 -05:00
Eric Haszlakiewicz
b98aa6eaa3 Create an additional libjson.so library that simply links against libjson-c, but emits a warning encouraging the use of the new library. 2012-07-29 14:59:01 -05:00
Eric Haszlakiewicz
c2d3ccf3af Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library 
Conflicts:
	.gitignore
	Makefile.am
	configure.in
	printbuf.c
	test1.c
	test1.expected
 2012-07-29 14:06:52 -05:00
Eric Haszlakiewicz
381f77c5bc Merge pull request #26 from ford-prefect/master 
Android build system
 2012-07-08 19:01:19 -07:00
Eric Haszlakiewicz
4154c55eda Add json_object_iterator.h to installed headers. 2012-07-08 20:38:53 -05:00
Arun Raghavan
a1221eba70 Add an Android-friendly build system 
This dependson the Androgenizer project, which helps keep autofoo-based build
systems in sync with the Android build.
 2012-04-26 13:18:33 +05:30
Eric Haszlakiewicz
c1b8891a13 Move the rest of the tests into the tests subdirectory. 2012-04-22 10:33:41 -05:00
Eric Haszlakiewicz
1e89ba68af Create a tests subdirectory and move one of the test to there. 2012-04-22 10:27:50 -05:00