Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
666d846c
Commit
666d846c
authored
Aug 02, 2019
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component apache-php: add support for password argon2 hashing
parent
2f9519e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
component/apache-php/buildout.cfg
component/apache-php/buildout.cfg
+4
-1
component/argon2/buildout.cfg
component/argon2/buildout.cfg
+13
-0
No files found.
component/apache-php/buildout.cfg
View file @
666d846c
...
@@ -3,6 +3,7 @@ parts = apache-php
...
@@ -3,6 +3,7 @@ parts = apache-php
extends =
extends =
../apache/buildout.cfg
../apache/buildout.cfg
../argon2/buildout.cfg
../bzip2/buildout.cfg
../bzip2/buildout.cfg
../cclient/buildout.cfg
../cclient/buildout.cfg
../curl/buildout.cfg
../curl/buildout.cfg
...
@@ -56,6 +57,7 @@ configure-options =
...
@@ -56,6 +57,7 @@ configure-options =
environment =
environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
[apache-php]
[apache-php]
# Note: Shall react on each build of apache and reinstall itself
# Note: Shall react on each build of apache and reinstall itself
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
@@ -85,6 +87,7 @@ configure-options =
...
@@ -85,6 +87,7 @@ configure-options =
--with-openssl=${openssl:location}
--with-openssl=${openssl:location}
--with-libzip=${libzip:location}
--with-libzip=${libzip:location}
--with-icu-dir=${icu:location}
--with-icu-dir=${icu:location}
--with-password-argon2=${argon2:location}
--enable-apcu-bc
--enable-apcu-bc
--enable-intl
--enable-intl
--enable-libxml
--enable-libxml
...
@@ -106,7 +109,7 @@ environment =
...
@@ -106,7 +109,7 @@ environment =
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
CPPFLAGS=-I${libzip:location}/include
CPPFLAGS=-I${libzip:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib
-L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu
TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
HOME=${apache:location}
HOME=${apache:location}
...
...
component/argon2/buildout.cfg
0 → 100644
View file @
666d846c
[buildout]
parts =
argon2
[argon2]
recipe = slapos.recipe.cmmi
url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz
md5sum = 0f234cc21ac6cebfe373da6afa70bb1d
configure-command = :
make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment