Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

Monero: bump to miniupnpc 2.1 #5

Merged
merged 30 commits into from
Jul 6, 2018
Merged

Conversation

anonimal
Copy link
Collaborator

@anonimal anonimal commented May 8, 2018

miniupnp and others added 29 commits April 12, 2018 11:36
[Effective Modern CMake](https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1)

- Set the minimum required version for CMake to 3.5
- Added `UPNPC_BUILD_SAMPLE` option for building sample client application (upnpc.c)
- Added interface target library `miniupnpc-private` for common settings like compile
  definitions, flags and include directories. It helps to keep global scope clean.
  https://cmake.org/cmake/help/v3.11/manual/cmake-buildsystem.7.html#interface-libraries
- Replaced `-fPIC` compile option with `POSITION_INDEPENDENT_CODE` target property
  https://cmake.org/cmake/help/v3.11/prop_tgt/POSITION_INDEPENDENT_CODE.html#prop_tgt:POSITION_INDEPENDENT_CODE
- Set usage requirements for `libminiupnpc-*` targets for more convenient
  usage through `add_subdirectory()` (as cmake subproject)
  https://cmake.org/cmake/help/v3.11/manual/cmake-buildsystem.7.html#build-specification-and-usage-requirements
- Removed old and outdated code from CMakeLists.txt
new function lease_file_rewrite()
that is called just before exiting, and when SIGUSR2 is received
see #295
@anonimal
Copy link
Collaborator Author

anonimal commented Jun 6, 2018

Ping @fluffypony @luigi1111

@fluffypony
Copy link
Contributor

@anonimal please rebase

@anonimal
Copy link
Collaborator Author

anonimal commented Jul 6, 2018

@fluffypony I've had to opt for a merge because rebasing will change the commit hashes for upstream's commits.

Merge conflicts resolved, we're good to go.

@fluffypony fluffypony merged commit 0842f18 into monero-project:monero Jul 6, 2018
fluffypony added a commit that referenced this pull request Jul 6, 2018
bd83693 miniupnpc: VERSION 2.1 (Thomas Bernard)
4a9c12c VBscript to generate miniupnpcstrings.h (Thomas Bernard)
530b272 Modernize and cleanup CMakeLists.txt (Tengiz Sharafiev)
d2bbdee fix typo introduced in 00abd9e (Thomas Bernard)
a921383 add option LEASEFILE_USE_REMAINING_TIME (Thomas Bernard)
d0e7958 lease_file_remove(): replace strncpy/strncat by snprintf() (Thomas Bernard)
f6ac854 miniupnpd: fix storing of unlimited lease time in lease_file (Thomas Bernard)
17773f0 if LEASEFILE_USE_REMAINING_TIME is defined, only the remaining time is stored (Thomas Bernard)
00abd9e miniupnpd: store UNIX time in lease_file (Thomas Bernard)
61703ad miniupnpc/lisdevices.c: remove warnings. fix leak (Thomas Bernard)
073642d test2 (Thomas Bernard)
cc3541e appveyor: version (Thomas Bernard)
f65d344 miniupnpc/listdevices: remove duplicates (Thomas Bernard)
bdfd7bb miniupnpc/listdevices: show devices sorted by XML desc URL (Thomas BERNARD)
491ee9f miniupnpd/upnpevents.c: Add log when error (Thomas Bernard)
0e3dd7b appveyor: message (Thomas Bernard)
a78750c appveyor: push artifacts (Thomas Bernard)
b7e1b2e miniupnpc/miniupnpcmodule.c: small fix (Thomas Bernard)
4931404 miniupnpc: build python module with appveyor (Thomas Bernard)
9663c55 miniupnpc/Makefile.mingw: Support cross compiling for Ming32 (Thomas Bernard)
53e8185 miniupnpd/pf: set dst address in rule if use_ext_ip_addr is set (Thomas Bernard)
5dcd40a netfilter/iptpinhole.c: remove warning: implicit declaration of function 'upnp_time' (Thomas Bernard)
0366cd0 replace strlen(s) > 0 by s[0] != '\0' (Thomas Bernard)
2b6fa08 no more strlen(xxx) == 0. (Thomas Bernard)
9d56943 update MS VS 2010 project files (Thomas Bernard)
154d27c miniupnpc/upnpc.c: 2017=>2018 (Thomas Bernard)
@anonimal anonimal deleted the monero branch July 6, 2018 21:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants