ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 18:49:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2022-09-03 13:58:01 +01:00
commit 367f5893c3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-macos.yml vendored
View File

@ -9,7 +9,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip macos ci]')" if: "!contains(github.event.head_commit.message, '[skip macos ci]')"
runs-on: macos-12 runs-on: macos-12
env: env:
CXXFLAGS: -Wno-error=deprecated-declarations HOMEBREW_NO_INSTALL_CLEANUP: 1
INSPIRCD_DEBUG: 3 INSPIRCD_DEBUG: 3
INSPIRCD_VERBOSE: 1 INSPIRCD_VERBOSE: 1
steps: steps:
@ -18,7 +18,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
brew update || true brew update || true
for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq mbedtls mysql-client openssl@3 pcre2 re2 rapidjson sqlite; for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq mbedtls mysql-client openssl@3 openldap pcre2 re2 rapidjson sqlite
do do
brew install $PACKAGE || brew upgrade $PACKAGE brew install $PACKAGE || brew upgrade $PACKAGE

2
.github/workflows/ci-windows.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
uses: microsoft/setup-msbuild@v1.0.2 uses: microsoft/setup-msbuild@v1.0.2
- name: Setup Conan - name: Setup Conan
uses: turtlebrowser/get-conan@v1.0 uses: turtlebrowser/get-conan@v1.1
- name: Install libraries - name: Install libraries
working-directory: ${{ github.workspace }}/win/build working-directory: ${{ github.workspace }}/win/build

4
README.md
View File

@ -18,7 +18,7 @@ InspIRCd is supported on the following platforms:
- Windows 10 build 17061 or newer using the MSVC 19.15+ (Visual Studio 15.8 2017) compiler and CMake 3.8 or newer. - Windows 10 build 17061 or newer using the MSVC 19.15+ (Visual Studio 15.8 2017) compiler and CMake 3.8 or newer.
Alternate platforms and toolchains may also work but are not officially supported by the InspIRCd team. Generally speaking if you are using a reasonably modern UNIX-like system you should be able to build InspIRCd on it. Other platforms and toolchains may also work but are not officially supported by the InspIRCd team. Generally speaking if you are using a reasonably modern UNIX-like system you should be able to build InspIRCd on it. If you can not and you wish to submit a patch we are happy to accept it as long as it is not extremely large.
If you encounter any bugs then [please file an issue](https://github.com/inspircd/inspircd/issues/new/choose). If you encounter any bugs then [please file an issue](https://github.com/inspircd/inspircd/issues/new/choose).
@ -31,7 +31,7 @@ Building from source on Windows is generally not recommended but [a guide is ava
<!-- <!--
TODO: uncomment this once we have binary packages for v4. TODO: uncomment this once we have binary packages for v4.
If you are running on CentOS 7, Debian 10/11/12, Rocky Linux 8, Ubuntu 18.04/20.04/22.04, or Windows 8+ binary packages are available from [the downloads page](https://github.com/inspircd/inspircd/releases/latest). If you are running on CentOS 7, Debian 11/12, Rocky Linux 8/9, Ubuntu 18.04/20.04/22.04, or Windows 8+ binary packages are available from [the downloads page](https://github.com/inspircd/inspircd/releases/latest).
A [Docker](https://www.docker.com) image is also available. See [the inspircd-docker repository](https://github.com/inspircd/inspircd-docker) for more information. A [Docker](https://www.docker.com) image is also available. See [the inspircd-docker repository](https://github.com/inspircd/inspircd-docker) for more information.
--> -->

2
src/modules/extra/m_ldap.cpp
View File

@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/// $LinkerFlags: find_compiler_flags("lber" "") find_compiler_flags("ldap" "") /// $CompilerFlags: find_compiler_flags("lber" "") find_compiler_flags("ldap" "")
/// $LinkerFlags: find_linker_flags("lber" "-llber") find_linker_flags("ldap" "-lldap_r") /// $LinkerFlags: find_linker_flags("lber" "-llber") find_linker_flags("ldap" "-lldap_r")
/// $PackageInfo: require_system("arch") libldap /// $PackageInfo: require_system("arch") libldap