Skip to content

Commit 6600ced

Browse files
committed
release 3.4.0: depend on liboauth2 >= 1.6.2
Signed-off-by: Hans Zandbelt <[email protected]>
1 parent 931aea0 commit 6600ced

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

.cproject

+8-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</extensions>
1919
</storageModule>
2020
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
21-
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools,org.eclipse.cdt.build.core.buildType=org.eclipse.linuxtools.cdt.autotools.core.buildType.default" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1562680719" name="Build (GNU)" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=unix:///var/run/docker.sock" parent="org.eclipse.linuxtools.cdt.autotools.core.configuration.build">
21+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools,org.eclipse.cdt.build.core.buildType=org.eclipse.linuxtools.cdt.autotools.core.buildType.default" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1562680719" name="Build (GNU)" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=unix:///var/run/docker.sock,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.linuxtools.cdt.autotools.core.configuration.build">
2222
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1562680719." name="/" resourcePath="">
2323
<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.617277945" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
2424
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.359991688" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
@@ -34,17 +34,16 @@
3434
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.548331172" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
3535
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.811285626" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
3636
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/liboauth2/include}&quot;"/>
37-
<listOptionValue builtIn="false" value="/opt/local/include/apache2/"/>
38-
<listOptionValue builtIn="false" value="/opt/local/include/apr-1"/>
39-
<listOptionValue builtIn="false" value="/opt/local/include"/>
37+
<listOptionValue builtIn="false" value="/opt/homebrew/Cellar/apr/1.7.4/include/apr-1"/>
38+
<listOptionValue builtIn="false" value="/opt/homebrew/Cellar/apr-util/1.6.3_1/include/apr-1"/>
39+
<listOptionValue builtIn="false" value="/opt/homebrew/include"/>
40+
<listOptionValue builtIn="false" value="/opt/homebrew/include/httpd"/>
4041
<listOptionValue builtIn="false" value="/usr/local/include"/>
41-
<listOptionValue builtIn="false" value="/Users/hzandbelt/projects/nginx/src/core"/>
42-
<listOptionValue builtIn="false" value="/Users/hzandbelt/projects/nginx/src/http"/>
4342
</option>
4443
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.2047978831" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
4544
<listOptionValue builtIn="false" value="HAVE_LIBHIREDIS=1"/>
4645
<listOptionValue builtIn="false" value="HAVE_LIBMEMCACHE=1"/>
47-
<listOptionValue builtIn="false" value="&quot;OAUTH2_PACKAGE_NAME_VERSION =&quot;mod_oauth2-0.0.0&quot;"/>
46+
<listOptionValue builtIn="false" value="OAUTH2_PACKAGE_NAME_VERSION =&quot;mod_oauth2-0.0.0&quot;"/>
4847
</option>
4948
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1754841162" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
5049
</tool>
@@ -79,7 +78,7 @@
7978
</extensions>
8079
</storageModule>
8180
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
82-
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools,org.eclipse.cdt.build.core.buildType=org.eclipse.linuxtools.cdt.autotools.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.debug.1551656597" name="Debug (GNU)" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=unix:///var/run/docker.sock" parent="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.debug">
81+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools,org.eclipse.cdt.build.core.buildType=org.eclipse.linuxtools.cdt.autotools.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.debug.1551656597" name="Debug (GNU)" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=unix:///var/run/docker.sock,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.debug">
8382
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.debug.1551656597." name="/" resourcePath="">
8483
<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.debug.1772566252" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain.debug">
8584
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.debug.1422301246" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.debug"/>
@@ -100,7 +99,7 @@
10099
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.854310462" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
101100
<listOptionValue builtIn="false" value="HAVE_LIBHIREDIS=1"/>
102101
<listOptionValue builtIn="false" value="HAVE_LIBMEMCACHE=1"/>
103-
<listOptionValue builtIn="false" value="&quot;OAUTH2_PACKAGE_NAME_VERSION =mod_oauth2-0.0.0&quot;"/>
102+
<listOptionValue builtIn="false" value="OAUTH2_PACKAGE_NAME_VERSION =&quot;mod_oauth2-0.0.0&quot;"/>
104103
</option>
105104
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.814681391" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
106105
</tool>

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@
2020
/config.guess~
2121
/config.sub~
2222
/configure~
23+
/install-sh~

ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
06/05/2024
2+
- depend on liboauth2 >= 1.6.2
3+
- release 3.4.0
4+
15
10/25/2023
26
- correct documentation wrt. cache encryption passphrase; see #52; thanks @webermax
37
- depend on liboauth2 >= 1.5.1; see https://github.com/OpenIDC/liboauth2/issues/44

configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([mod_oauth2],[3.3.2],[[email protected]])
1+
AC_INIT([mod_oauth2],[3.4.0],[[email protected]])
22

33
AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
44
AC_CONFIG_MACRO_DIRS([m4])
@@ -27,11 +27,11 @@ AC_SUBST(APR_LIBS)
2727
AC_SUBST(APACHE_CFLAGS)
2828
AC_ARG_VAR(APXS_OPTS, [additional command line options to pass to apxs])
2929

30-
PKG_CHECK_MODULES(OAUTH2, [liboauth2 >= 1.5.1])
30+
PKG_CHECK_MODULES(OAUTH2, [liboauth2 >= 1.6.2])
3131
AC_SUBST(OAUTH2_CFLAGS)
3232
AC_SUBST(OAUTH2_LIBS)
3333

34-
PKG_CHECK_MODULES(OAUTH2_APACHE, [liboauth2_apache >= 1.5.1])
34+
PKG_CHECK_MODULES(OAUTH2_APACHE, [liboauth2_apache >= 1.6.2])
3535
AC_SUBST(OAUTH2_APACHE_CFLAGS)
3636
AC_SUBST(OAUTH2_APACHE_LIBS)
3737

0 commit comments

Comments
 (0)