Skip to content

Commit 665ea75

Browse files
tessustessus
committed
Merge branch 'autotools'
2 parents b9493cd + 36261be commit 665ea75

31 files changed

+871
-229
lines changed

‎.gitignore

+11
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,14 @@
33
*.lo
44
*.o
55
*.slo
6+
build/
7+
config.h
8+
config.log
9+
config.nice
10+
config.status
11+
configure
12+
Makefile
13+
*.in
14+
aclocal.m4
15+
autom4te.cache/
16+
html/

‎ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
mod_authnz_ibmdb2 2.2.6
2+
3+
- use autotools build system
4+
- updated man pages
5+
16
mod_authnz_ibmdb2 2.2.5
27

38
- internal code changes

‎INSTALL

+45-29
Original file line numberDiff line numberDiff line change
@@ -6,51 +6,67 @@
66
| Website: http://tessus.github.io/mod_authnz_ibmdb2 |
77
+----------------------------------------------------------------------+
88

9-
1) Building the module
10-
2) Details on building the module (Linux)
11-
3) Installing the man pages
9+
1) Building the module from a cloned repository
10+
2) Building the module from a tarball
11+
3) configure options
1212

1313
+----------------------------------------------------------------------+
14-
| 1. Building the module |
14+
| 1. Building the module from a cloned repository |
1515
+----------------------------------------------------------------------+
1616

17-
Please change the PATH settings and the APXS variable
18-
in the makemod script for your environment.
17+
git clone https://github.com/tessus/mod_authnz_ibmdb2.git
1918

20-
run as root: ./makemod
19+
cd mod_authnz_ibmdb2
20+
./autogen.sh (autotools required)
21+
./configure (see section 3 for details)
22+
make install (as root or with sudo)
2123

2224
+----------------------------------------------------------------------+
23-
| 2. Details on building the module |
25+
| 2. Building the module from a tarball |
2426
+----------------------------------------------------------------------+
2527

26-
DB2PATH=/home/db2inst1/sqllib
27-
EXTRA_LFLAG="-Wl,-rpath,$DB2PATH/lib"
28+
Download the latest tarball from:
29+
https://github.com/tessus/mod_authnz_ibmdb2/releases/latest
2830

29-
apxs -c -ldb2 $EXTRA_LFLAG mod_authnz_ibmdb2.c caching.c
31+
tar -xzf mod_authnz_ibmdb2-X.Y.Z.tar.gz
3032

31-
If the sqlcli1.h header file cannot be found, add the -I option to specify the
32-
directory where sqlcli1.h can be found.
33-
If the db2 library cannot be found, add the -L option to specify the
34-
directory where libdb2.so can be found.
35-
For example:
33+
cd mod_authnz_ibmdb2
34+
./configure (see section 3 for details)
35+
make install (as root or with sudo)
3636

37-
apxs -c -L/home/db2inst1/sqllib/lib -I/home/db2inst1/sqllib/include -ldb2
38-
$EXTRA_LFLAG mod_authnz_ibmdb2.c caching.c
37+
+----------------------------------------------------------------------+
38+
| 3. configure options and details on building the module |
39+
+----------------------------------------------------------------------+
3940

40-
To move the DSO to the modules directory:
41+
If you run ./configure as a user with a DB2 environment and apxs is in
42+
the path, there's nothing else to worry about.
4143

42-
apxs -i mod_authnz_ibmdb2.la
44+
However, you might have 2 versions of Apache installed and want to
45+
choose for which one the module is for, or you don't have the DB2 env
46+
initialized.
4347

44-
As the next step the DB2 environment has to be set in the Apache startscript.
45-
You just need to source the db2profile script, which is located in DB2PATH.
48+
There are options to specify the location of the DB2 home and the
49+
apxs utility:
4650

47-
Finally, add the following directive to httpd.conf:
51+
--with-apxs=FILE FILE is the pathname of the Apache tool
4852

49-
LoadModule authnz_ibmdb2_module modules/mod_authnz_ibmdb2.so
53+
--with-IBM_DB2=DIR DIR is the IBM DB2 instance or home
54+
directory where the DB2 application
55+
development headers and libraries are
56+
located
5057

51-
+----------------------------------------------------------------------+
52-
| 3. Installing the man pages |
53-
+----------------------------------------------------------------------+
58+
By default man pages are installed automatically, but you can change
59+
this by using the following flag:
60+
61+
--disable-man-pages
62+
63+
During install the module can also be activated in the Apache config
64+
file httpd.conf:
65+
66+
--enable-activation
67+
68+
After successful configuration the module can be installed with:
69+
70+
make install
5471

55-
Change to the ./man directory and run the script
56-
./maninstall
72+
Be aware that this process needs root privileges.

‎LICENSE

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎Makefile.am

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
AUTOMAKE_OPTIONS = foreign
2+
SUBDIRS = src man
3+
4+
EXTRA_DIST = ChangeLog INSTALL README LICENSE
5+
6+
install-man:
7+
cd man && make install-man
8+
9+
dist-sign:
10+
gpg -ba $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz

‎README

+9-19
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@
66
| Website: http://tessus.github.io/mod_authnz_ibmdb2 |
77
+----------------------------------------------------------------------+
88

9-
1) Description of the module
10-
2) File descriptions
9+
1) Install
10+
2) Description of the module
1111

1212
+----------------------------------------------------------------------+
13-
| 1. Description of the module |
13+
| 1. Install |
14+
+----------------------------------------------------------------------+
15+
16+
see INSTALL
17+
18+
+----------------------------------------------------------------------+
19+
| 2. Description of the module |
1420
+----------------------------------------------------------------------+
1521

1622
mod_authnz_ibmdb2 is an Apache authentication module using IBM DB2 as the backend database for
@@ -125,19 +131,3 @@ The stored procedure for group authentication must return an open cursor
125131
to the resultset.
126132

127133
Two examples for stored procedures are given in the documentation.
128-
129-
+----------------------------------------------------------------------+
130-
| 2. File descriptions |
131-
+----------------------------------------------------------------------+
132-
133-
mod_authnz_ibmdb2.c the Apache module
134-
mod_authnz_ibmdb2.h the Apache module's header file
135-
caching.c code for caching mechanism
136-
caching.h include file for caching mechanism
137-
sha2.h include file for APR sha256
138-
makemod bash script to compile the module
139-
makemod.bat script to compile the module under win32
140-
README this file
141-
INSTALL compile and install instructions
142-
ChangeLog change log
143-
man/maninstall bash script to install the manpages

‎autogen.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
autoreconf -i -v -f

0 commit comments

Comments
 (0)